316 files changed, 89501 insertions, 27582 deletions

diff --git a/ChangeLog b/ChangeLog
index d8c3348..97fd1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,848 @@
+2006-05-15	<rlk@sourceforge.net>
+
+	Files:	po/fr.po (1.71) (+17 -17)
+
+	Clean up a few messages that may break PPD files.
+
+2006-05-14	<rleigh@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.22) (+5 -10)
+
+	doc/README.maintaining: Update CVS instructions for the new SourceForge
+	CVS repositories.
+
+2006-05-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.87) (+4 -2)
+
+	Distribute test-ppds
+
+2006-05-14	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.292) (+3 -0)
+
+	Final prep for 5.0.0-rc3.
+
+2006-05-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-ppds (1.2) (+40 -2)
+
+	Run in relaxed mode by default.  Run strict check also, but don't
+	signal an exit status on strict errors.
+
+2006-05-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.86) (+3 -1)
+		src/cups/test-ppds (1.1) (added)
+
+	Check PPD files for conformance in make check
+
+2006-05-13	<rlk@sourceforge.net>
+
+	Files:	README (1.159) (+8 -8)
+
+	Prep for 5.0.0-rc3 release.
+
+2006-05-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.291) (+35 -18)
+
+	1487715 HP DeskJet 690 and related crash in grayscale w/photo ink
+	1487717 Canon/Lexmark printers fail in color mode w/BW inks
+	1487720 Canon printers crash in grayscale with photo ink
+
+2006-05-12	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/.cvsignore (1.4) (+2 -0)
+
+	More files to ignore.
+
+2006-05-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.173) (+2 -7)
+
+	Permit use of color printing with black and white inks (obviously,
+	still prints in grayscale).
+
+2006-05-12	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.139) (+4 -2)
+		src/testpattern/Makefile.am (1.24) (+4 -3)
+		src/testpattern/printer_options.c (1.1) (added)
+		src/testpattern/run-testpattern-2.in (1.1) (added)
+		test/Makefile.am (1.46) (+1 -5)
+
+	Add improved test based on testpattern generator.
+
+2006-05-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-lexmark.c (1.153) (+5 -18)
+
+	Handle grayscale mode correctly with color inks.
+
+2006-05-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-pcl.c (1.142) (+11 -8)
+
+	Handle photo ink cartridge in black and white mode correctly.
+
+2006-05-07	<rlk@sourceforge.net>
+
+	Files:	test/run-testdither (1.11) (+32 -40)
+		test/run-weavetest (1.24) (+2 -2)
+		test/testdither.c (1.49) (+147 -87)
+
+	Fix paths.
+
+	Make testdither valgrind-able.
+
+2006-05-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.290) (+18 -14)
+		src/main/escp2-resolutions.c (1.33) (+34 -4)
+		src/main/print-escp2-data.c (1.199) (+3 -3)
+		src/main/print-escp2.h (1.103) (+3 -2)
+
+	Do not attempt to use resolutions above 1440x1440 on CX4600 and related
+	printers.  These resolutions are not recommended by the manual and
+	are likely to result in extremely slow printing.
+
+2006-05-06	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.35) (+86 -75)
+		po/da.po (1.66) (+1138 -1001)
+		po/de.po (1.48) (+86 -75)
+		po/el.po (1.49) (+86 -75)
+		po/en_GB.po (1.140) (+86 -75)
+		po/es.po (1.47) (+86 -75)
+		po/fr.po (1.70) (+86 -75)
+		po/hu.po (1.5) (+86 -75)
+		po/ja.po (1.43) (+86 -75)
+		po/nb.po (1.10) (+86 -75)
+		po/nl.po (1.49) (+86 -75)
+		po/pl.po (1.53) (+86 -75)
+		po/pt.po (1.48) (+86 -75)
+		po/sk.po (1.52) (+86 -75)
+		po/sv.po (1.79) (+87 -76)
+		po/zh_TW.po (1.7) (+86 -75)
+
+	Gutenprint 20060505 snapshot
+
+2006-05-06	<rlk@sourceforge.net>
+
+	Files:	scripts/global.mk (1.10) (+2 -2)
+		src/cups/Makefile.am (1.85) (+5 -4)
+		src/foomatic/Makefile.am (1.49) (+4 -3)
+		test/Makefile.am (1.45) (+4 -1)
+
+	Attempt to work with non-GNU make
+
+2006-05-05	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.289) (+4 -4)
+
+	Note improvements to the CX4600 and friends.
+
+2006-05-05	<rlk@sourceforge.net>
+
+	Files:	test/escp2-weavetest.c (1.37) (+10 -1)
+
+	Add a spinner to show progress.
+
+2006-05-05	<rlk@sourceforge.net>
+
+	Files:	test/run-weavetest (1.23) (+10 -2)
+
+	Set STP_DATA_PATH and STP_MODULE_PATH.
+
+	Add 24 to the list of row separations in case we need it.
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.198) (+2 -2)
+
+	CX4600 and related printers need mod-8 positioning for good performance.
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	src/gimp/print.c (1.66) (+2 -1)
+
+	Warn translators not to translate the "<Image>" component of the menu
+	path.
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.288) (+5 -0)
+		po/cs.po (1.34) (+2 -2)
+		po/da.po (1.65) (+2 -2)
+		po/pt.po (1.47) (+2 -2)
+
+	1478819 bad translation format
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.64) (+7425 -120)
+
+	Fix botched po file
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.63) (+120 -8132)
+
+	Updated Danish PO
+
+2006-05-04	<rlk@sourceforge.net>
+
+	Files:	src/gimp2/print.c (1.7) (+2 -1)
+
+	Warn translators not to translate the top level part of the menu.
+
+2006-05-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.287) (+1 -1)
+
+	Correct bug ID.
+
+2006-05-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.286) (+12 -5)
+		src/main/print-escp2-data.c (1.197) (+10 -10)
+
+	Improve performance for R800 and related printers.
+
+2006-04-30	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.285) (+26 -20)
+		src/main/escp2-driver.c (1.28) (+10 -4)
+		src/main/escp2-resolutions.c (1.32) (+39 -1)
+		src/main/print-escp2-data.c (1.196) (+80 -80)
+		src/main/print-escp2.c (1.350) (+13 -2)
+		src/main/print-escp2.h (1.102) (+5 -2)
+
+	1479124 Very poor performance with Epson R2400, R800, and R1800
+
+	R800 still needs to be fully tested.
+
+2006-04-29	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.11) (+1 -1)
+
+	Comment
+
+2006-04-29	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.10) (+103 -54)
+
+	Stream the input (don't slurp it all into memory).
+
+2006-04-25	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.33) (+900 -862)
+		po/da.po (1.62) (+899 -862)
+		po/de.po (1.47) (+900 -862)
+		po/el.po (1.48) (+899 -863)
+		po/en_GB.po (1.139) (+900 -862)
+		po/es.po (1.46) (+900 -862)
+		po/fr.po (1.69) (+900 -862)
+		po/hu.po (1.4) (+899 -862)
+		po/ja.po (1.42) (+900 -862)
+		po/nb.po (1.9) (+900 -862)
+		po/nl.po (1.48) (+900 -862)
+		po/pl.po (1.52) (+894 -862)
+		po/pt.po (1.46) (+900 -862)
+		po/sk.po (1.51) (+900 -862)
+		po/sv.po (1.78) (+901 -863)
+		po/zh_TW.po (1.6) (+895 -862)
+
+	Gutenprint 20060425 snapshot
+
+2006-04-23	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.284) (+7 -7)
+
+	Minor updates.
+
+2006-04-22	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.283) (+44 -28)
+		src/main/print-escp2-data.c (1.195) (+152 -32)
+		src/main/print-escp2.h (1.101) (+3 -2)
+
+	Fix input slots for RX700, R1800, and R2400
+
+2006-04-22	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.117) (+11 -3)
+
+	Set the HWMargins to borderless.
+
+2006-04-20	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.282) (+4 -0)
+		src/main/papers.xml (1.21) (+22 -1)
+
+	Add a few more paper sizes
+
+2006-04-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.281) (+20 -15)
+
+	Note further IJS improvements.
+
+2006-04-19	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgutenprint.c (1.14) (+22 -12)
+
+	Try to abort job cleanly.
+
+2006-04-19	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgutenprint.c (1.13) (+22 -17)
+
+	1466678 Epson Stylus Photo R300 fails to eject last page
+
+	(That bug refers specifically to 4.2, but the problem is certainly
+	present in 5.0)
+
+2006-04-18	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpattern.c (1.44) (+4 -1)
+
+	Read the test pattern file with LC_LANG set to C to avoid
+	language-specific parsing problems.
+
+2006-04-17	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.32) (+3057 -1114)
+		po/da.po (1.61) (+3318 -938)
+		po/de.po (1.46) (+2594 -707)
+		po/el.po (1.47) (+2989 -1061)
+		po/en_GB.po (1.138) (+3272 -932)
+		po/es.po (1.45) (+3051 -1121)
+		po/fr.po (1.68) (+4345 -2332)
+		po/hu.po (1.3) (+4179 -1381)
+		po/ja.po (1.41) (+3056 -1114)
+		po/nb.po (1.8) (+2986 -1058)
+		po/nl.po (1.47) (+2997 -1067)
+		po/pl.po (1.51) (+2920 -1000)
+		po/pt.po (1.45) (+3056 -1114)
+		po/sk.po (1.50) (+3052 -1122)
+		po/sv.po (1.77) (+3057 -1115)
+		po/zh_TW.po (1.5) (+3313 -930)
+
+	Gutenprint 20060417 snapshot release
+
+2006-04-17	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.172) (+27 -12)
+
+	Clean up segfaults for many CcMmYK/CcMmYyK printers.  Pending review
+	by Sascha.
+
+2006-04-17	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.c (1.78) (+8 -4)
+
+	Clean up memory leak.
+
+2006-04-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.280) (+86 -20)
+		include/gutenprint/printers.h (1.3) (+4 -2)
+		include/gutenprint/vars.h (1.3) (+28 -1)
+		src/cups/genppd.c (1.116) (+12 -3)
+		src/cups/rastertoprinter.c (1.99) (+91 -7)
+		src/foomatic/printer_margins.c (1.17) (+12 -2)
+		src/ghost/ijsgutenprint.c (1.12) (+172 -8)
+		src/main/print-canon.c (1.171) (+2 -1)
+		src/main/print-escp2.c (1.349) (+56 -17)
+		src/main/print-lexmark.c (1.152) (+2 -1)
+		src/main/print-olympus.c (1.58) (+31 -8)
+		src/main/print-pcl.c (1.141) (+2 -1)
+		src/main/print-ps.c (1.84) (+31 -6)
+		src/main/print-raw.c (1.38) (+2 -1)
+		src/main/printers.c (1.77) (+10 -1)
+
+	1318890 Borderless print scaled wrongly
+	1467956 Print to CD prints incorrectly with CUPS driver
+
+2006-04-16	<rlk@sourceforge.net>
+
+	Files:	src/escputil/d4lib.c (1.7) (+21 -19)
+		src/escputil/escputil.c (1.85) (+32 -25)
+
+	Improve robustness in some cases.
+
+	Improve debug output.
+
+2006-04-16	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.9) (+14 -18)
+
+	Minor additional performance tuning.
+
+	Fix up old printers.
+
+2006-04-15	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.8) (+91 -134)
+
+	Performance improvements and use strict mode.
+
+2006-04-13	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.97) (+2 -2)
+
+	Improve tuning of inkjet paper on R300 family.
+
+2006-04-13	<rlk@sourceforge.net>
+
+	Files:	src/main/print-ps.c (1.83) (+13 -7)
+
+	Compute the media size and bounding box correctly.
+
+2006-04-13	<rlk@sourceforge.net>
+
+	Files:	test/unprint.c (1.37) (+3 -3)
+
+	Print out the size information for the unprinted image.
+
+2006-03-29	<rlk@sourceforge.net>
+
+	Files:	man/cups-genppdupdate.8.in (1.5) (+25 -4)
+
+	1) -N option means reset options to defaults (i. e. don't try to
+	    extract previous options from the PPD file).
+
+	2) -o option means output PPD files into the specified directory
+	    rather than /etc/cups/ppd
+
+	3) You can specify PPD files on the command line, which overrides
+	   either the default directory or the directory specified with -o.
+	   If you do this, you can either specify the exact PPD file by name
+	   or the base name of a PPD file (i. e. a queue name) in the PPD
+	   directory.  For example, you can specify "espr2400" as shorthand
+	   for "/etc/cups/ppd/espr2400.ppd".
+
+	4) Hungarian is now in the list of languages.
+
+	5) It no longer tries (and fails) to update Foomatic PPD files; it
+	   simply ignores them silently.
+
+2006-03-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.279) (+26 -6)
+
+	Add information about changes to cups-genppdupdate and bug 1458059.
+
+2006-03-29	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.24) (+107 -42)
+
+	1) -N option means reset options to defaults (i. e. don't try to
+	    extract previous options from the PPD file).
+
+	2) -o option means output PPD files into the specified directory
+	    rather than /etc/cups/ppd
+
+	3) You can specify PPD files on the command line, which overrides
+	   either the default directory or the directory specified with -o.
+	   If you do this, you can either specify the exact PPD file by name
+	   or the base name of a PPD file (i. e. a queue name) in the PPD
+	   directory.  For example, you can specify "espr2400" as shorthand
+	   for "/etc/cups/ppd/espr2400.ppd".
+
+	4) Hungarian is now in the list of languages.
+
+	5) It no longer tries (and fails) to update Foomatic PPD files; it
+	   simply ignores them silently.
+
+2006-03-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.170) (+2 -2)
+
+	only 600x600 dpi is working for the PIXMA iP4000
+
+2006-03-28	<rlk@sourceforge.net>
+
+	Files:	src/main/print-lexmark.c (1.151) (+92 -149)
+
+	1458059 Lexmark Z52 not working
+
+	(Only partially tested)
+
+2006-03-28	<rlk@sourceforge.net>
+
+	Files:	src/main/bit-ops.c (1.9) (+2 -2)
+
+	Compute line width correctly for uncompressed case.
+
+2006-03-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.278) (+9 -9)
+		README (1.158) (+15 -17)
+		configure.ac (1.138) (+3 -3)
+
+	Bump version.
+
+2006-03-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.194) (+2 -2)
+
+	Allow 5760x2880 DPI on R2400.
+
+2006-03-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.277) (+107 -25)
+
+	Clarify wording.
+
+	State relationship of options to their Gimp-Print 4.2 equivalents.
+
+2006-03-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-weave.c (1.64) (+15 -2)
+
+	Add some more debug information.
+
+2006-03-23	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.276) (+167 -105)
+
+	Minor reorganization
+
+2006-03-21	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.275) (+1015 -26)
+		doc/Makefile.am (1.45) (+2 -7)
+		doc/gutenprint-options (1.3) (removed)
+
+	Move options description into release notes.
+
+2006-03-19	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.137) (+74 -8)
+
+	Print configureation summary after configure is complete.
+
+2006-03-19	<rlk@sourceforge.net>
+
+	Files:	autogen.sh (1.7) (+12 -2)
+
+	If user passes --help or -h to autogen.sh and configure exists, pass
+	the help option through to configure.
+
+2006-03-19	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither-matrices.c (1.36) (+4 -4)
+
+	Use stp_erprintf rather than stderr.
+
+2006-03-19	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.169) (+34 -19)
+
+	1379402 BJC-4400: SEGFAULT (photo-ink/color mode)
+
+2006-03-18	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui2/panel.c (1.10) (+4 -4)
+
+	Display thumbnail correctly in CMY mode.
+
+2006-03-18	<rlk@sourceforge.net>
+
+	Files:	src/cups/epson.c (1.7) (+7 -6)
+
+	Reduce sleep time if write to printer would block to 2 ms from 200
+	ms.  2 ms is probably more appropriate for today's computers and
+	printers.
+
+2006-03-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.168) (+11 -3)
+
+	Handle CCMMYK and CCMMYYK inks correctly; force PrintingMode to black
+	and white if we're using only black ink.
+
+2006-03-13	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/Makefile.am (1.48) (+3 -1)
+		src/foomatic/foomatic-generator.in (1.59) (+19 -7)
+		src/foomatic/printer_margins.c (1.16) (+8 -1)
+		src/foomatic/printer_options.c (1.49) (+6 -2)
+
+	Generate simplified Foomatic data in addition to full-featured data,
+	similar to the recent addition to the CUPS driver.
+
+2006-03-13	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-ijs/gutenprint.xml (1.6) (+12 -15)
+
+	Update the comments.
+
+2006-03-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.274) (+6 -0)
+
+	Minor tweak
+
+2006-03-12	<rlk@sourceforge.net>
+
+	Files:	src/main/papers.xml (1.20) (+2 -2)
+
+	Rename Epson 4x6 Photo Paper to reduce confusion
+
+2006-03-12	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.144) (+2 -2)
+
+	Rename Kyocera FS-600 (KPDL-2) to Kyocera FS-600 - KPDL-2 to make for
+	a legal PPD file.
+
+2006-03-12	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.115) (+5 -4)
+
+	If the number of paper sizes is small, list them all in the simplified
+	PPD.  This avoids problems with some of the dye sub printers that only
+	support a very small number of obscure page sizes.
+
+2006-03-12	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.273) (+9 -10)
+
+	Rearrange the release notes somewhat.
+
+2006-03-11	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.272) (+550 -580)
+		README (1.157) (+46 -18)
+
+	Updates
+
+2006-03-11	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.96) (+6 -6)
+
+	Improve grayscale on plain paper for R300 and friends.
+
+2006-03-11	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.136) (+16 -2)
+		src/cups/Makefile.am (1.84) (+4 -4)
+		src/cups/cups-genppdupdate.in (1.23) (+13 -5)
+		src/cups/genppd.c (1.114) (+121 -96)
+		src/cups/rastertoprinter.c (1.98) (+10 -3)
+
+	Offer simplified PPD files in CUPS.
+
+2006-03-11	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.135) (+3 -3)
+		src/escputil/escputil.c (1.84) (+60 -29)
+		src/main/print-escp2-data.c (1.193) (+2 -2)
+
+	Detect getopt_long() correctly.
+
+	Add options to allow specifying number of line pairs and patterns in
+	escputil explicitly.
+
+	Change alignment pair count for Stylus Photo 700 to 15 in response to
+	reports.  This seems out of whack, though.
+
+2006-03-04	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.271) (+57 -18)
+
+	Update the release notes.
+
+2006-03-04	<rlk@sourceforge.net>
+
+	Files:	src/main/print-ps.c (1.82) (+3 -1)
+
+	PPD file parameter should always be active.
+
+2006-03-03	<rlk@sourceforge.net>
+
+	Files:	po/fr.po (1.67) (+1913 -1912)
+
+	Updated French translation from Olivier Poulet
+
+2006-03-03	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.270) (+752 -1068)
+		src/foomatic/foomatic-generator.in (1.58) (+47 -34)
+		src/foomatic/foomatic-printermap (1.113) (+555 -553)
+		src/main/printers.c (1.76) (+174 -60)
+		src/main/printers.xml (1.143) (+789 -1457)
+
+	List all printers, generating PPD files and foomatic data for them,
+	rather than using a compatibility list.
+
+	Allow use of parameter sets rather than having to list all parameters
+	for each printer.
+
+2006-03-02	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.192) (+2 -2)
+
+	CX4600 and friends are 4-color printers, not 6-color printers.
+
+2006-02-25	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.112) (+6 -7)
+
+	Corrected Foomatic IDs of some printers.
+
+2006-02-18	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.134) (+3 -3)
+		po/hu.po (1.2) (+5116 -0)
+
+	Add Hungarian translation
+
+2006-02-07	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.83) (+2 -1)
+
+	Need ctype.h for isgraph.
+
+2006-02-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.269) (+22 -1)
+		src/foomatic/foomatic-printermap (1.111) (+10 -0)
+		src/main/print-escp2-data.c (1.191) (+70 -2)
+		src/main/printers.xml (1.142) (+41 -1)
+
+	Corrected support for Epson PM-970C and PM-980C.
+
+	Support for Epson Stylus Photo 830U.
+
+	Support for Japanese Epson printers:
+
+	* Expected full support for E-150, E-200
+
+	* Experimental support for PM-A900, PM-D800, PM-G730, PX-V630
+
+	* Preliminary support for PM-A650, PM-A750, PM-A890
+
+2006-02-05	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.95) (+22 -22)
+
+	Improve tuning for R2400 matte
+
+2006-02-04	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.82) (+535 -340)
+
+	Print more status for older printers.
+
+	Refactor the status code.
+
+2006-02-04	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.268) (+1 -0)
+		src/foomatic/foomatic-printermap (1.110) (+1 -0)
+		src/main/printers.xml (1.141) (+5 -1)
+
+	Add Epson Stylus Photo 830U
+
+2006-02-03	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.94) (+26 -26)
+
+	Improve R2400 tuning on photo ink set.
+
+2006-02-02	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.348) (+39 -32)
+
+	1422101 Raw output does not work on R800 and related printers
+
+2006-01-31	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.61) (+6 -6)
+		src/main/escp2-papers.c (1.93) (+26 -26)
+
+	Improve greens on R800.
+
+	Improve R2400.
+
+2006-01-29	<rleigh@sourceforge.net>
+
+	Files:	m4extra/glib.m4 (1.1) (added)
+
+	Add glib-1.2 m4 macros.
+
+2006-01-28	<rlk@sourceforge.net>
+
+	Files:	src/escputil/d4lib.c (1.6) (+77 -11)
+		src/escputil/escputil.c (1.81) (+2 -2)
+
+	Improve debugging output
+
+2006-01-28	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.80) (+109 -9)
+
+	1417603 escputil seg faults if you type ctrl-D to prompt
+	1417600 escputil clean and nozzle check don't work on new printers
+
+	Improve debug messages.
+
+2006-01-28	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.92) (+8 -8)
+
+	A few more tweaks for the R300
+
+2006-01-23	<rleigh@sourceforge.net>
+
+	Files:	src/ghost/.cvsignore (1.12) (+1 -0)
+
+	Add ijsgutenprint.5.0.
+
+2006-01-23	<rleigh@sourceforge.net>
+
+	Files:	doc/Makefile.am (1.44) (+3 -3)
+
+	Install gutenprint-options from $(srcdir), so VPATH builds do not break.
+
+2006-01-21	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.10) (+54 -14)
+
+	Print the log for files on the mainline that have been removed.
+	This retains history when files are moved around.
+
+2006-01-21	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.31) (+1271 -960)
+		po/da.po (1.60) (+1281 -960)
+		po/de.po (1.45) (+1233 -960)
+		po/el.po (1.46) (+1271 -959)
+		po/en_GB.po (1.137) (+1272 -959)
+		po/es.po (1.44) (+1271 -960)
+		po/fr.po (1.66) (+1271 -960)
+		po/ja.po (1.40) (+1271 -960)
+		po/nb.po (1.7) (+1271 -960)
+		po/nl.po (1.46) (+1271 -960)
+		po/pl.po (1.50) (+1268 -958)
+		po/pt.po (1.44) (+1271 -960)
+		po/sk.po (1.49) (+1271 -960)
+		po/sv.po (1.76) (+1274 -961)
+		po/zh_TW.po (1.4) (+1268 -960)
+
+	Gutenprint 5.0.0-rc2 release
+
+2006-01-16	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.267) (+5 -0)
+
+	Note instructions for printing directly to CD.
+
 2006-01-16	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.266) (+9 -0)
@@ -27,7 +872,7 @@
 
 	Files:	NEWS (1.265) (+32 -23)
 		doc/Makefile.am (1.43) (+7 -2)
-		doc/gutenprint-options (1.1) ( )
+		doc/gutenprint-options (1.1) (added)
 
 	Add gutenprint-options documentation
 
@@ -62,7 +907,7 @@
 2006-01-09	<rleigh@sourceforge.net>
 
 	Files:	m4extra/gettext.m4 (1.2) (+510 -276)
-		m4extra/gtk.m4 (1.1) ( )
+		m4extra/gtk.m4 (1.1) (added)
 		m4extra/lcmessage.m4 (1.2) (+28 -17)
 		m4extra/libtool.m4 (1.2) (+6333 -338)
 		m4extra/progtest.m4 (1.2) (+71 -26)
@@ -371,6 +1216,12 @@
 
 2005-11-22	<rleigh@sourceforge.net>
 
+	Files:	debian/.cvsignore (1.8) (removed)
+
+	Remove .cvsignore.
+
+2005-11-22	<rleigh@sourceforge.net>
+
 	Files:	doc/developer/Makefile.am (1.18) (+2 -2)
 		doc/users_guide/Makefile.am (1.44) (+3 -3)
 		src/cups/Makefile.am (1.83) (+3 -3)
@@ -711,8 +1562,8 @@
 2005-08-27	<tillkamppeter@sourceforge.net>
 
 	Files:	NEWS (1.232) (+10 -6)
-		src/foomatic/foomatic-templates-ijs/STP_InputSlot.xml (1.1) ( )
-		src/foomatic/foomatic-templates-ijs/STP_MediaType.xml (1.1) ( )
+		src/foomatic/foomatic-templates-ijs/STP_InputSlot.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/STP_MediaType.xml (1.1) (added)
 
 	Added template files to rename "STP_InputSlot" and "STP_MediaType" to
 	"InputSlot" and "Mediatype", removed duplicate Canon Pixma item from
@@ -847,7 +1698,7 @@
 2005-08-10	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.129) (+3 -3)
-		po/zh_TW.po (1.1) ( )
+		po/zh_TW.po (1.1) (added)
 
 	Add zh_TW support
 
@@ -1082,6 +1933,39 @@
 
 	Files:	Makefile.am (1.143) (+2 -19)
 		configure.ac (1.127) (+2 -3)
+		debian/Makefile.am (1.13) (removed)
+		debian/README.Debian (1.55) (removed)
+		debian/README.building (1.9) (removed)
+		debian/changelog (1.71) (removed)
+		debian/compat (1.2) (removed)
+		debian/control.in (1.49) (removed)
+		debian/copyright (1.9) (removed)
+		debian/cupsys-driver-gutenprint.docs (1.2) (removed)
+		debian/cupsys-driver-gutenprint.install (1.2) (removed)
+		debian/cupsys-driver-gutenprint.postinst (1.3) (removed)
+		debian/cupsys-driver-gutenprint.postrm (1.4) (removed)
+		debian/escputil.docs (1.4) (removed)
+		debian/escputil.install (1.3) (removed)
+		debian/foomatic-db-gutenprint.install (1.3) (removed)
+		debian/gimp-print.docs (1.3) (removed)
+		debian/gimp-print.install (1.4) (removed)
+		debian/gimp-print.postrm (1.3) (removed)
+		debian/gimp-print.preinst (1.3) (removed)
+		debian/gutenprint-doc.doc-base (1.2) (removed)
+		debian/gutenprint-doc.install (1.3) (removed)
+		debian/gutenprint-locales.install (1.2) (removed)
+		debian/ijsgutenprint.install (1.3) (removed)
+		debian/libgutenprint-dev.docs (1.2) (removed)
+		debian/libgutenprint-dev.install (1.3) (removed)
+		debian/libgutenprint-doc.doc-base.developer.in (1.2) (removed)
+		debian/libgutenprint-doc.doc-base.reference.in (1.2) (removed)
+		debian/libgutenprint-doc.install.in (1.3) (removed)
+		debian/libgutenprint.install.in (1.3) (removed)
+		debian/libgutenprintui1-dev.install (1.2) (removed)
+		debian/libgutenprintui1.install.in (1.2) (removed)
+		debian/libgutenprintui2-dev.install (1.3) (removed)
+		debian/libgutenprintui2.install.in (1.2) (removed)
+		debian/rules (1.59) (removed)
 
 	Remove Debian packaging.
 
@@ -1164,6 +2048,12 @@
 
 	Update from freetranslations.org
 
+2005-06-26	<rleigh@sourceforge.net>
+
+	Files:	debian/Makefile.am (1.12) (+3 -1)
+
+	Distribute libgutenprintui1 files.
+
 2005-06-26	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.338) (+9 -9)
@@ -1182,6 +2072,24 @@
 
 2005-06-26	<rleigh@sourceforge.net>
 
+	Files:	debian/changelog (1.70) (+12 -0)
+		debian/control.in (1.48) (+63 -6)
+		debian/libgutenprint.install.in (1.2) (+4 -4)
+		debian/libgutenprintui1-dev.install (1.1) (added)
+		debian/libgutenprintui1.install.in (1.1) (added)
+		debian/rules (1.58) (+25 -15)
+
+	Update Debian pacakging for 5.0.0-rc1:
+	- New upstream release candidate.
+	- Upgrade to Standards-Version 3.6.2
+	- Create a dummy cupsys-driver-gimpprint package to enable
+	  upgrades from stable.
+	- Re-add libgutenprintui1 packages, required for cinepaint.
+	- debian/rules, add LIBRARYUI_VERSION, required to support
+	  separate sonames for libgutenprint and libgutenprintui*.
+
+2005-06-26	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.126) (+34 -20)
 		src/gutenprintui/Makefile.am (1.4) (+6 -6)
 		src/gutenprintui2/Makefile.am (1.5) (+6 -6)
@@ -1323,6 +2231,7 @@
 
 	Files:	configure.ac (1.124) (+3 -3)
 		po/nb.po (1.2) (+5746 -0)
+		po/no.po (1.62) (removed)
 
 	Rename no.po to nb.po, because nb_NO is the correct locale for
 	Norwegian Bokmål.
@@ -1375,6 +2284,16 @@
 	Handle nonexistence of PPD directories prior to creating them,
 	avoiding unnecessary error messages.
 
+2005-05-05	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.69) (+2 -1)
+		debian/control.in (1.47) (+3 -3)
+		debian/cupsys-driver-gutenprint.postrm (1.3) (+1 -0)
+		debian/rules (1.57) (+1 -2)
+
+	Sync Debian dependencies with current Debian packages.
+	Remove PPD directory in cupsys-driver-gimpprint postrm.
+
 2005-04-30	<rleigh@sourceforge.net>
 
 	Files:	src/cups/cups-genppdupdate.in (1.19) (+2 -6)
@@ -1392,6 +2311,7 @@
 		po/fr.po (1.61) (+328 -279)
 		po/ja.po (1.35) (+327 -278)
 		po/nl.po (1.41) (+332 -286)
+		po/no.po (1.61) (+333 -284)
 		po/pl.po (1.45) (+330 -284)
 		po/pt.po (1.39) (+327 -278)
 		po/sk.po (1.44) (+329 -280)
@@ -1414,6 +2334,18 @@
 
 	Fix regex used for filename/directory check.
 
+2005-04-27	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.68) (+12 -0)
+		debian/control.in (1.46) (+2 -2)
+		debian/foomatic-db-gutenprint.install (1.2) (+2 -2)
+		debian/gutenprint-doc.install (1.2) (+0 -9)
+		debian/ijsgutenprint.install (1.2) (+1 -1)
+		debian/libgutenprint-dev.install (1.2) (+0 -1)
+		debian/rules (1.56) (+4 -1)
+
+	Update Debian packaging for 5.0.0-beta4.
+
 2005-04-26	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.218) (+2 -3)
@@ -1549,13 +2481,14 @@
 		doc/.cvsignore (1.10) (+1 -0)
 		doc/Makefile.am (1.39) (+6 -2)
 		doc/gutenprint.dox.in (1.3) (+1 -1)
-		doc/gutenprintui2.dox.in (1.1) ( )
+		doc/gutenprintui2.dox.in (1.1) (added)
 
 	Documentation updates
 
 2005-04-18	<rlk@sourceforge.net>
 
 	Files:	src/ghost/Makefile.am (1.37) (+1 -3)
+		src/ghost/README (1.94) (removed)
 
 	Remove obsolete README file
 
@@ -1563,6 +2496,16 @@
 
 	Files:	configure.ac (1.121) (+2 -12)
 		man/Makefile.am (1.21) (+2 -14)
+		man/gutenprint-color.7.in (1.2) (removed)
+		man/gutenprint-dithers.7.in (1.2) (removed)
+		man/gutenprint-imagetypes.7.in (1.2) (removed)
+		man/gutenprint-inktypes.7.in (1.2) (removed)
+		man/gutenprint-mediasizes.7.in (1.2) (removed)
+		man/gutenprint-mediasources.7.in (1.2) (removed)
+		man/gutenprint-mediatypes.7.in (1.2) (removed)
+		man/gutenprint-models.7.in (1.2) (removed)
+		man/gutenprint-resolutions.7.in (1.2) (removed)
+		man/gutenprint.3.in (1.2) (removed)
 		man/ijsgutenprint.1.in (1.2) (+10 -42)
 
 	Remove old, outdated documentation.
@@ -1724,6 +2667,7 @@
 		po/fr.po (1.60) (+1573 -928)
 		po/ja.po (1.34) (+1571 -921)
 		po/nl.po (1.40) (+1567 -917)
+		po/no.po (1.60) (+1634 -987)
 		po/pl.po (1.44) (+1527 -883)
 		po/pt.po (1.38) (+1571 -927)
 		po/sk.po (1.43) (+1571 -921)
@@ -1839,8 +2783,8 @@
 2005-04-09	<rlk@sourceforge.net>
 
 	Files:	src/escputil/Makefile.am (1.18) (+2 -0)
-		src/escputil/d4lib.c (1.1) ( )
-		src/escputil/d4lib.h (1.1) ( )
+		src/escputil/d4lib.c (1.1) (added)
+		src/escputil/d4lib.h (1.1) (added)
 		src/escputil/escputil.c (1.67) (+547 -259)
 
 	Further improvements to printer detection: now works even if a new
@@ -2101,6 +3045,7 @@
 		po/fr.po (1.59) (+341 -318)
 		po/ja.po (1.33) (+341 -318)
 		po/nl.po (1.39) (+341 -318)
+		po/no.po (1.59) (+341 -318)
 		po/pl.po (1.43) (+341 -318)
 		po/pt.po (1.37) (+341 -318)
 		po/sk.po (1.42) (+341 -318)
@@ -2122,6 +3067,20 @@
 
 2005-02-06	<rleigh@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.11) (+1 -3)
+		debian/changelog (1.67) (+4 -1)
+		debian/control.in (1.45) (+1 -48)
+		debian/libgutenprintui-dev.install (1.2) (removed)
+		debian/libgutenprintui.install.in (1.2) (removed)
+		debian/rules (1.55) (+5 -8)
+
+	Remove libgutenprintui packages, since libgimp1.2 and gimp1.2
+	are no longer available in Debian unstable and hence it has
+	no users.
+	Remove libgtk1.2 build dependency.
+
+2005-02-06	<rleigh@sourceforge.net>
+
 	Files:	doc/Makefile.am (1.37) (+2 -1)
 
 	Add a rule to allow "make dist" to succeed if not running with
@@ -2158,6 +3117,12 @@
 
 2005-01-30	<rleigh@sourceforge.net>
 
+	Files:	debian/control.in (1.44) (+13 -13)
+
+	Update package descriptions to make them lintian-clean.
+
+2005-01-30	<rleigh@sourceforge.net>
+
 	Files:	.cvsignore (1.24) (+1 -0)
 		doc/developer/Makefile.am (1.16) (+3 -3)
 		doc/users_guide/Makefile.am (1.42) (+9 -9)
@@ -2291,6 +3256,20 @@
 
 	Rename Gimp-Print to Gutenprint
 
+2004-11-16	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.66) (+5 -1)
+
+	Update changelog with plug-in location and FAQ duplicate removal changes.
+
+2004-11-16	<rleigh@sourceforge.net>
+
+	Files:	debian/gimp-print.docs (1.2) (+2 -1)
+		debian/gimp-print.install (1.3) (+1 -3)
+
+	Install the GIMP 2.0 Print plugin into the right place.
+	Don't install two separate copies of the FAQ.
+
 2004-11-02	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.117) (+4 -4)
@@ -2321,6 +3300,16 @@
 	Don't build the GIMP 2.0 Print plug-in unless the pkg-config check
 	succeeds.
 
+2004-11-01	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.43) (+3 -3)
+		debian/cupsys-driver-gutenprint.postinst (1.2) (+5 -5)
+		debian/cupsys-driver-gutenprint.postrm (1.2) (+5 -5)
+
+	Reload cupsys with force-reload in cupsys-driver-gutenprint maintainer
+	scripts.
+	All development packages depend on pkg-config.
+
 2004-10-31	<rleigh@sourceforge.net>
 
 	Files:	include/gutenprintui/Makefile.am (1.2) (+3 -2)
@@ -2338,6 +3327,16 @@
 	Put PPDs in $cupsmodeldir/gutenprint rather than $cupsmodeldir/gimp-print.
 	Allow updating of old Gimp-Print PPDs in addition to Gutenprint PPDs.
 
+2004-10-31	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.42) (+2 -1)
+		debian/libgutenprint-doc.install.in (1.2) (+1 -1)
+		debian/libgutenprintui2-dev.install (1.2) (+3 -3)
+
+	Correct dependencies to allow upgrade from gimp-print packages.
+	Correct packaging errors so that the correct files are placed in the
+	right packages.
+
 2004-10-26	<rleigh@sourceforge.net>
 
 	Files:	src/gutenprintui/Makefile.am (1.2) (+3 -2)
@@ -2348,6 +3347,12 @@
 	This should allow correct building on Microsoft Windows and IBM AIX
 	systems.
 
+2004-10-23	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.65) (+6 -0)
+
+	Update version for 5.0.0-beta3.
+
 2004-10-18	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.197) (+7 -7)
@@ -2410,7 +3415,53 @@
 		README (1.142) (+33 -30)
 		autogen.sh (1.6) (+1 -1)
 		configure.ac (1.114) (+132 -132)
-		cups-gutenprint.list.in (1.1) ( )
+		cups-gimpprint.list.in (1.4) (removed)
+		cups-gutenprint.list.in (1.1) (added)
+		cups/cups-gimpprint.list.in (1.2) (removed)
+		debian/Makefile.am (1.10) (+20 -16)
+		debian/README.Debian (1.54) (+11 -7)
+		debian/README.building (1.8) (+7 -7)
+		debian/changelog (1.64) (+22 -0)
+		debian/control.in (1.41) (+176 -83)
+		debian/copyright (1.8) (+1 -1)
+		debian/cupsys-driver-gimpprint.docs (1.5) (removed)
+		debian/cupsys-driver-gimpprint.install (1.7) (removed)
+		debian/cupsys-driver-gimpprint.postinst (1.6) (removed)
+		debian/cupsys-driver-gimpprint.postrm (1.6) (removed)
+		debian/cupsys-driver-gutenprint.docs (1.1) (added)
+		debian/cupsys-driver-gutenprint.install (1.1) (added)
+		debian/cupsys-driver-gutenprint.postinst (1.1) (added)
+		debian/cupsys-driver-gutenprint.postrm (1.1) (added)
+		debian/foomatic-db-gimp-print.install (1.3) (removed)
+		debian/foomatic-db-gutenprint.install (1.1) (added)
+		debian/gimp-print.install (1.2) (+1 -1)
+		debian/gimp-print.postrm (1.2) (+2 -2)
+		debian/gimp-print.preinst (1.2) (+2 -2)
+		debian/gimpprint-doc.doc-base (1.3) (removed)
+		debian/gimpprint-doc.install (1.3) (removed)
+		debian/gimpprint-locales.install (1.3) (removed)
+		debian/gutenprint-doc.doc-base (1.1) (added)
+		debian/gutenprint-doc.install (1.1) (added)
+		debian/gutenprint-locales.install (1.1) (added)
+		debian/ijsgimpprint.install (1.3) (removed)
+		debian/ijsgutenprint.install (1.1) (added)
+		debian/libgimpprint-dev.docs (1.5) (removed)
+		debian/libgimpprint-dev.install (1.5) (removed)
+		debian/libgimpprint-doc.doc-base.developer.in (1.2) (removed)
+		debian/libgimpprint-doc.doc-base.reference.in (1.2) (removed)
+		debian/libgimpprint-doc.install.in (1.5) (removed)
+		debian/libgimpprint.install.in (1.3) (removed)
+		debian/libgutenprint-dev.docs (1.1) (added)
+		debian/libgutenprint-dev.install (1.1) (added)
+		debian/libgutenprint-doc.doc-base.developer.in (1.1) (added)
+		debian/libgutenprint-doc.doc-base.reference.in (1.1) (added)
+		debian/libgutenprint-doc.install.in (1.1) (added)
+		debian/libgutenprint.install.in (1.1) (added)
+		debian/libgutenprintui-dev.install (1.1) (added)
+		debian/libgutenprintui.install.in (1.1) (added)
+		debian/libgutenprintui2-dev.install (1.1) (added)
+		debian/libgutenprintui2.install.in (1.1) (added)
+		debian/rules (1.54) (+42 -38)
 		doc/.cvsignore (1.9) (+3 -3)
 		doc/FAQ.html (1.10) (+5 -5)
 		doc/Makefile.am (1.36) (+11 -11)
@@ -2419,13 +3470,15 @@
 		doc/developer/Makefile.am (1.15) (+15 -15)
 		doc/developer/copying.xml (1.2) (+8 -8)
 		doc/developer/escp2.xml (1.2) (+1 -1)
-		doc/developer/gutenprint.xml (1.1) ( )
+		doc/developer/gimpprint.xml (1.2) (removed)
+		doc/developer/gutenprint.xml (1.1) (added)
 		doc/developer/introduction.xml (1.2) (+18 -18)
 		doc/developer/new-printer.xml (1.2) (+1 -1)
 		doc/developer/problems.xml (1.2) (+4 -4)
 		doc/developer/using.xml (1.2) (+34 -34)
 		doc/developer/weave.xml (1.2) (+1 -1)
-		doc/gutenprint.dox.in (1.1) ( )
+		doc/gimpprint.dox.in (1.6) (removed)
+		doc/gutenprint.dox.in (1.1) (added)
 		doc/users_guide/README (1.7) (+1 -1)
 		doc/users_guide/cups-edition.sgml (1.2) (+5 -5)
 		doc/users_guide/cups.sgml (1.4) (+15 -15)
@@ -2437,45 +3490,81 @@
 		doc/users_guide/util-edition.sgml (1.2) (+5 -5)
 		doc/users_guide/utils.sgml (1.6) (+3 -3)
 		include/Makefile.am (1.6) (+3 -3)
-		include/gutenprint/.cvsignore (1.1) ( )
-		include/gutenprint/Makefile.am (1.1) ( )
-		include/gutenprint/array.h (1.1) ( )
-		include/gutenprint/bit-ops.h (1.1) ( )
-		include/gutenprint/channel.h (1.1) ( )
-		include/gutenprint/color.h (1.1) ( )
-		include/gutenprint/curve-cache.h (1.1) ( )
-		include/gutenprint/curve.h (1.1) ( )
-		include/gutenprint/dither.h (1.1) ( )
-		include/gutenprint/gutenprint-intl-internal.h (1.1) ( )
-		include/gutenprint/gutenprint-intl.h (1.1) ( )
-		include/gutenprint/gutenprint-module.h (1.1) ( )
-		include/gutenprint/gutenprint-version.h.in (1.1) ( )
-		include/gutenprint/gutenprint.h (1.1) ( )
-		include/gutenprint/image.h (1.1) ( )
-		include/gutenprint/list.h (1.1) ( )
-		include/gutenprint/module.h (1.1) ( )
-		include/gutenprint/mxml.h (1.1) ( )
-		include/gutenprint/paper.h (1.1) ( )
-		include/gutenprint/path.h (1.1) ( )
-		include/gutenprint/printers.h (1.1) ( )
-		include/gutenprint/sequence.h (1.1) ( )
-		include/gutenprint/string-list.h (1.1) ( )
-		include/gutenprint/util.h (1.1) ( )
-		include/gutenprint/vars.h (1.1) ( )
-		include/gutenprint/weave.h (1.1) ( )
-		include/gutenprint/xml.h (1.1) ( )
-		include/gutenprintui/.cvsignore (1.1) ( )
-		include/gutenprintui/Makefile.am (1.1) ( )
-		include/gutenprintui/gutenprintui.h (1.1) ( )
-		include/gutenprintui2/.cvsignore (1.1) ( )
-		include/gutenprintui2/Makefile.am (1.1) ( )
-		include/gutenprintui2/curve.h (1.1) ( )
-		include/gutenprintui2/gammacurve.h (1.1) ( )
-		include/gutenprintui2/gutenprintui.h (1.1) ( )
+		include/gimp-print-ui/Makefile.am (1.2) (removed)
+		include/gimp-print-ui/gimp-print-ui.h (1.5) (removed)
+		include/gimp-print-ui2/.cvsignore (1.2) (removed)
+		include/gimp-print-ui2/Makefile.am (1.5) (removed)
+		include/gimp-print-ui2/curve.h (1.2) (removed)
+		include/gimp-print-ui2/gammacurve.h (1.2) (removed)
+		include/gimp-print-ui2/gimp-print-ui.h (1.4) (removed)
+		include/gimp-print/.cvsignore (1.3) (removed)
+		include/gimp-print/Makefile.am (1.16) (removed)
+		include/gimp-print/array.h (1.10) (removed)
+		include/gimp-print/bit-ops.h (1.2) (removed)
+		include/gimp-print/channel.h (1.3) (removed)
+		include/gimp-print/color.h (1.7) (removed)
+		include/gimp-print/curve-cache.h (1.3) (removed)
+		include/gimp-print/curve.h (1.14) (removed)
+		include/gimp-print/dither.h (1.4) (removed)
+		include/gimp-print/gimp-print-intl-internal.h (1.5) (removed)
+		include/gimp-print/gimp-print-intl.h (1.6) (removed)
+		include/gimp-print/gimp-print-module.h (1.2) (removed)
+		include/gimp-print/gimp-print-version.h.in (1.5) (removed)
+		include/gimp-print/gimp-print.h (1.41) (removed)
+		include/gimp-print/image.h (1.7) (removed)
+		include/gimp-print/list.h (1.4) (removed)
+		include/gimp-print/module.h (1.3) (removed)
+		include/gimp-print/mxml.h (1.3) (removed)
+		include/gimp-print/paper.h (1.5) (removed)
+		include/gimp-print/path.h (1.2) (removed)
+		include/gimp-print/printers.h (1.7) (removed)
+		include/gimp-print/sequence.h (1.8) (removed)
+		include/gimp-print/string-list.h (1.8) (removed)
+		include/gimp-print/util.h (1.10) (removed)
+		include/gimp-print/vars.h (1.16) (removed)
+		include/gimp-print/weave.h (1.4) (removed)
+		include/gimp-print/xml.h (1.8) (removed)
+		include/gutenprint/.cvsignore (1.1) (added)
+		include/gutenprint/Makefile.am (1.1) (added)
+		include/gutenprint/array.h (1.1) (added)
+		include/gutenprint/bit-ops.h (1.1) (added)
+		include/gutenprint/channel.h (1.1) (added)
+		include/gutenprint/color.h (1.1) (added)
+		include/gutenprint/curve-cache.h (1.1) (added)
+		include/gutenprint/curve.h (1.1) (added)
+		include/gutenprint/dither.h (1.1) (added)
+		include/gutenprint/gutenprint-intl-internal.h (1.1) (added)
+		include/gutenprint/gutenprint-intl.h (1.1) (added)
+		include/gutenprint/gutenprint-module.h (1.1) (added)
+		include/gutenprint/gutenprint-version.h.in (1.1) (added)
+		include/gutenprint/gutenprint.h (1.1) (added)
+		include/gutenprint/image.h (1.1) (added)
+		include/gutenprint/list.h (1.1) (added)
+		include/gutenprint/module.h (1.1) (added)
+		include/gutenprint/mxml.h (1.1) (added)
+		include/gutenprint/paper.h (1.1) (added)
+		include/gutenprint/path.h (1.1) (added)
+		include/gutenprint/printers.h (1.1) (added)
+		include/gutenprint/sequence.h (1.1) (added)
+		include/gutenprint/string-list.h (1.1) (added)
+		include/gutenprint/util.h (1.1) (added)
+		include/gutenprint/vars.h (1.1) (added)
+		include/gutenprint/weave.h (1.1) (added)
+		include/gutenprint/xml.h (1.1) (added)
+		include/gutenprintui/.cvsignore (1.1) (added)
+		include/gutenprintui/Makefile.am (1.1) (added)
+		include/gutenprintui/gutenprintui.h (1.1) (added)
+		include/gutenprintui2/.cvsignore (1.1) (added)
+		include/gutenprintui2/Makefile.am (1.1) (added)
+		include/gutenprintui2/curve.h (1.1) (added)
+		include/gutenprintui2/gammacurve.h (1.1) (added)
+		include/gutenprintui2/gutenprintui.h (1.1) (added)
 		m4/stp.m4 (1.6) (+3 -3)
 		m4/stp_cups.m4 (1.9) (+1 -1)
 		m4/stp_gimp.m4 (1.9) (+1 -1)
 		m4/stp_option.m4 (1.5) (+1 -1)
+		m4/stp_path_lib.m4 (1.4) (removed)
+		m4/stp_pkgconfig.m4 (1.6) (removed)
 		m4extra/stp_release.m4.in (1.3) (+1 -1)
 		man/.cvsignore (1.8) (+11 -11)
 		man/Makefile.am (1.20) (+13 -13)
@@ -2484,7 +3573,28 @@
 		man/cups-genppdconfig.8.in (1.6) (+6 -7)
 		man/cups-genppdupdate.8.in (1.4) (+6 -7)
 		man/escputil.1.in (1.11) (+3 -3)
-		man/ijsgutenprint.1.in (1.1) ( )
+		man/gimpprint-color.7.in (1.4) (removed)
+		man/gimpprint-dithers.7.in (1.4) (removed)
+		man/gimpprint-imagetypes.7.in (1.5) (removed)
+		man/gimpprint-inktypes.7.in (1.4) (removed)
+		man/gimpprint-mediasizes.7.in (1.4) (removed)
+		man/gimpprint-mediasources.7.in (1.4) (removed)
+		man/gimpprint-mediatypes.7.in (1.4) (removed)
+		man/gimpprint-models.7.in (1.9) (removed)
+		man/gimpprint-resolutions.7.in (1.6) (removed)
+		man/gimpprint.3.in (1.8) (removed)
+		man/gutenprint-color.7.in (1.1) (added)
+		man/gutenprint-dithers.7.in (1.1) (added)
+		man/gutenprint-imagetypes.7.in (1.1) (added)
+		man/gutenprint-inktypes.7.in (1.1) (added)
+		man/gutenprint-mediasizes.7.in (1.1) (added)
+		man/gutenprint-mediasources.7.in (1.1) (added)
+		man/gutenprint-mediatypes.7.in (1.1) (added)
+		man/gutenprint-models.7.in (1.1) (added)
+		man/gutenprint-resolutions.7.in (1.1) (added)
+		man/gutenprint.3.in (1.1) (added)
+		man/ijsgimpprint.1.in (1.8) (removed)
+		man/ijsgutenprint.1.in (1.1) (added)
 		po/.cvsignore (1.10) (+2 -2)
 		po/POTFILES.in (1.20) (+10 -5)
 		po/cs.po (1.23) (+359 -333)
@@ -2496,12 +3606,14 @@
 		po/fr.po (1.58) (+359 -333)
 		po/ja.po (1.32) (+359 -333)
 		po/nl.po (1.38) (+359 -333)
+		po/no.po (1.58) (+358 -333)
 		po/pl.po (1.42) (+359 -338)
 		po/pt.po (1.36) (+359 -333)
 		po/sk.po (1.41) (+359 -333)
 		po/sv.po (1.67) (+360 -334)
 		scripts/Makefile.am (1.4) (+1 -2)
 		scripts/autogen.sh (1.32) (+16 -16)
+		scripts/buildgimpprintdebs (1.3) (removed)
 		scripts/global.mk (1.9) (+8 -8)
 		src/Makefile.am (1.18) (+3 -3)
 		src/cups/.cvsignore (1.9) (+1 -1)
@@ -2517,15 +3629,19 @@
 		src/foomatic/.cvsignore (1.9) (+1 -1)
 		src/foomatic/Makefile.am (1.44) (+10 -10)
 		src/foomatic/foomatic-generator.in (1.50) (+112 -112)
-		src/foomatic/foomatic-templates-ijs/gutenprint.xml (1.1) ( )
-		src/foomatic/gutenprint-version.c (1.1) ( )
+		src/foomatic/foomatic-templates-ijs/gimp-print.xml (1.5) (removed)
+		src/foomatic/foomatic-templates-ijs/gutenprint.xml (1.1) (added)
+		src/foomatic/gimp-print-version.c (1.4) (removed)
+		src/foomatic/gutenprint-version.c (1.1) (added)
 		src/foomatic/paper_sizes.c (1.8) (+2 -6)
 		src/foomatic/printer_margins.c (1.15) (+2 -6)
 		src/foomatic/printer_options.c (1.44) (+3 -7)
 		src/foomatic/printers.c (1.10) (+2 -6)
 		src/ghost/.cvsignore (1.11) (+1 -1)
 		src/ghost/Makefile.am (1.35) (+4 -4)
-		src/ghost/ijsgutenprint.c (1.1) ( )
+		src/ghost/README (1.93) (+21 -21)
+		src/ghost/ijsgimpprint.c (1.55) (removed)
+		src/ghost/ijsgutenprint.c (1.1) (added)
 		src/gimp/Makefile.am (1.35) (+4 -4)
 		src/gimp/print-intl.h (1.6) (+7 -6)
 		src/gimp/print.c (1.64) (+3 -3)
@@ -2534,30 +3650,54 @@
 		src/gimp2/print-intl.h (1.3) (+6 -6)
 		src/gimp2/print.c (1.4) (+3 -3)
 		src/gimp2/print_gimp.h (1.3) (+3 -12)
-		src/gutenprintui/.cvsignore (1.1) ( )
-		src/gutenprintui/Makefile.am (1.1) ( )
-		src/gutenprintui/gutenprintui-internal.h (1.1) ( )
-		src/gutenprintui/gutenprintui.pc.in (1.1) ( )
-		src/gutenprintui/panel.c (1.1) ( )
-		src/gutenprintui/plist.c (1.1) ( )
-		src/gutenprintui/print-image-thumbnail.c (1.1) ( )
-		src/gutenprintui/printrc.h (1.1) ( )
-		src/gutenprintui/printrcl.l (1.1) ( )
-		src/gutenprintui/printrcy.y (1.1) ( )
-		src/gutenprintui/ui-utils.c (1.1) ( )
-		src/gutenprintui2/.cvsignore (1.1) ( )
-		src/gutenprintui2/Makefile.am (1.1) ( )
-		src/gutenprintui2/curve.c (1.1) ( )
-		src/gutenprintui2/gammacurve.c (1.1) ( )
-		src/gutenprintui2/gutenprintui-internal.h (1.1) ( )
-		src/gutenprintui2/gutenprintui2.pc.in (1.1) ( )
-		src/gutenprintui2/panel.c (1.1) ( )
-		src/gutenprintui2/plist.c (1.1) ( )
-		src/gutenprintui2/print-image-thumbnail.c (1.1) ( )
-		src/gutenprintui2/printrc.h (1.1) ( )
-		src/gutenprintui2/printrcl.l (1.1) ( )
-		src/gutenprintui2/printrcy.y (1.1) ( )
-		src/gutenprintui2/ui-utils.c (1.1) ( )
+		src/gutenprintui/.cvsignore (1.1) (added)
+		src/gutenprintui/Makefile.am (1.1) (added)
+		src/gutenprintui/gutenprintui-internal.h (1.1) (added)
+		src/gutenprintui/gutenprintui.pc.in (1.1) (added)
+		src/gutenprintui/panel.c (1.1) (added)
+		src/gutenprintui/plist.c (1.1) (added)
+		src/gutenprintui/print-image-thumbnail.c (1.1) (added)
+		src/gutenprintui/printrc.h (1.1) (added)
+		src/gutenprintui/printrcl.l (1.1) (added)
+		src/gutenprintui/printrcy.y (1.1) (added)
+		src/gutenprintui/ui-utils.c (1.1) (added)
+		src/gutenprintui2/.cvsignore (1.1) (added)
+		src/gutenprintui2/Makefile.am (1.1) (added)
+		src/gutenprintui2/curve.c (1.1) (added)
+		src/gutenprintui2/gammacurve.c (1.1) (added)
+		src/gutenprintui2/gutenprintui-internal.h (1.1) (added)
+		src/gutenprintui2/gutenprintui2.pc.in (1.1) (added)
+		src/gutenprintui2/panel.c (1.1) (added)
+		src/gutenprintui2/plist.c (1.1) (added)
+		src/gutenprintui2/print-image-thumbnail.c (1.1) (added)
+		src/gutenprintui2/printrc.h (1.1) (added)
+		src/gutenprintui2/printrcl.l (1.1) (added)
+		src/gutenprintui2/printrcy.y (1.1) (added)
+		src/gutenprintui2/ui-utils.c (1.1) (added)
+		src/libgimpprintui/.cvsignore (1.5) (removed)
+		src/libgimpprintui/Makefile.am (1.12) (removed)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.17) (removed)
+		src/libgimpprintui/gimpprintui.pc.in (1.2) (removed)
+		src/libgimpprintui/panel.c (1.75) (removed)
+		src/libgimpprintui/plist.c (1.42) (removed)
+		src/libgimpprintui/print-image-thumbnail.c (1.7) (removed)
+		src/libgimpprintui/printrc.h (1.5) (removed)
+		src/libgimpprintui/printrcl.l (1.11) (removed)
+		src/libgimpprintui/printrcy.y (1.16) (removed)
+		src/libgimpprintui/ui-utils.c (1.11) (removed)
+		src/libgimpprintui2/.cvsignore (1.3) (removed)
+		src/libgimpprintui2/Makefile.am (1.6) (removed)
+		src/libgimpprintui2/curve.c (1.2) (removed)
+		src/libgimpprintui2/gammacurve.c (1.2) (removed)
+		src/libgimpprintui2/gimp-print-ui-internal.h (1.4) (removed)
+		src/libgimpprintui2/gimpprintui2.pc.in (1.3) (removed)
+		src/libgimpprintui2/panel.c (1.10) (removed)
+		src/libgimpprintui2/plist.c (1.6) (removed)
+		src/libgimpprintui2/print-image-thumbnail.c (1.3) (removed)
+		src/libgimpprintui2/printrc.h (1.3) (removed)
+		src/libgimpprintui2/printrcl.l (1.5) (removed)
+		src/libgimpprintui2/printrcy.y (1.4) (removed)
+		src/libgimpprintui2/ui-utils.c (1.4) (removed)
 		src/main/.cvsignore (1.22) (+1 -4)
 		src/main/Makefile.am (1.87) (+15 -15)
 		src/main/array.c (1.16) (+4 -4)
@@ -2587,12 +3727,17 @@
 		src/main/escp2-resolutions.c (1.25) (+4 -4)
 		src/main/generic-options.c (1.8) (+4 -4)
 		src/main/generic-options.h (1.5) (+4 -4)
-		src/main/gutenprint-internal.h (1.1) ( )
-		src/main/gutenprint.dtd (1.1) ( )
-		src/main/gutenprint.pc.in (1.1) ( )
-		src/main/gutenprint.xsd (1.1) ( )
+		src/main/gimp-print-internal.h (1.72) (removed)
+		src/main/gimpprint.dtd (1.7) (removed)
+		src/main/gimpprint.pc.in (1.4) (removed)
+		src/main/gimpprint.xsd (1.8) (removed)
+		src/main/gutenprint-internal.h (1.1) (added)
+		src/main/gutenprint.dtd (1.1) (added)
+		src/main/gutenprint.pc.in (1.1) (added)
+		src/main/gutenprint.xsd (1.1) (added)
 		src/main/image.c (1.6) (+3 -3)
-		src/main/libgutenprint.sym (1.1) ( )
+		src/main/libgimpprint.sym (1.6) (removed)
+		src/main/libgutenprint.sym (1.1) (added)
 		src/main/module.c (1.25) (+5 -5)
 		src/main/mxml-attr.c (1.7) (+3 -3)
 		src/main/mxml-file.c (1.7) (+3 -3)
@@ -2644,6 +3789,25 @@
 
 	Separate out "black transition" from "black gamma"
 
+2004-09-12	<rleigh@sourceforge.net>
+
+	Files:	jmv/README (1.4) (removed)
+
+	Remove unused directory.
+
+2004-09-12	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print-ui2/Makefile.am (1.4) (+6 -2)
+		src/libgimpprintui2/Makefile.am (1.5) (+6 -2)
+
+	Only trigger typebuiltins regeneration on Makefile change in maintainer-mode.
+
+2004-09-12	<rleigh@sourceforge.net>
+
+	Files:	src/gimp/instead_of_gimp_main.c (1.6) (removed)
+
+	Remove unused code.
+
 2004-08-26	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.22) (+797 -648)
@@ -2655,6 +3819,7 @@
 		po/fr.po (1.57) (+797 -648)
 		po/ja.po (1.31) (+797 -648)
 		po/nl.po (1.37) (+797 -649)
+		po/no.po (1.57) (+797 -648)
 		po/pl.po (1.41) (+795 -648)
 		po/pt.po (1.35) (+797 -648)
 		po/sk.po (1.40) (+797 -648)
@@ -2765,6 +3930,16 @@
 
 2004-08-21	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/plist.c (1.41) (+257 -13)
+		src/libgimpprintui2/plist.c (1.5) (+257 -13)
+
+	1013565 GIMP plugin may not exit at completion
+
+	Use fclose() rather than incorrect pclose() to close off stream to
+	print process.  This must have been missed in earlier rearchitecture.
+
+2004-08-21	<rlk@sourceforge.net>
+
 	Files:	src/testpattern/testpatterny.y (1.26) (+97 -10)
 
 	Add debugging
@@ -2816,6 +3991,28 @@
 
 	Need a bit more black ink on the R300.
 
+2004-08-21	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/panel.c (1.9) (+12 -1)
+
+	Allocate extra space for GtkScrolledWindows which don't request enough
+	by default.
+
+2004-08-19	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.74) (+44 -29)
+		src/libgimpprintui/ui-utils.c (1.10) (+8 -6)
+		src/libgimpprintui2/gimp-print-ui-internal.h (1.3) (+2 -5)
+		src/libgimpprintui2/panel.c (1.8) (+54 -38)
+		src/libgimpprintui2/ui-utils.c (1.3) (+12 -19)
+
+	Put dynamically-generated tables into GtkScrolledWindows.
+	Fix table widget packing to use optimal amounts of space.
+	Prevent dialog windows from shrinking smaller than their size requisition.
+	GTK+-2.0 only:
+	Don't use gtk_window_set_wmclass().
+	Replace gtk_window_set_policy() with gtk_window_set_resizable().
+
 2004-08-19	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.184) (+2 -1)
@@ -2824,10 +4021,20 @@
 
 2004-08-19	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.101) (+32 -6)
+	Files:	include/gimp-print/vars.h (1.15) (+71 -1)
+		src/cups/genppd.c (1.101) (+32 -6)
 		src/cups/rastertoprinter.c (1.91) (+12 -2)
 		src/foomatic/foomatic-generator.in (1.49) (+43 -2)
 		src/foomatic/printer_options.c (1.43) (+25 -1)
+		src/ghost/ijsgimpprint.c (1.54) (+28 -2)
+		src/libgimpprintui/panel.c (1.73) (+129 -1)
+		src/libgimpprintui/plist.c (1.40) (+13 -3)
+		src/libgimpprintui/printrcl.l (1.10) (+3 -2)
+		src/libgimpprintui/printrcy.y (1.15) (+18 -2)
+		src/libgimpprintui2/panel.c (1.7) (+129 -1)
+		src/libgimpprintui2/plist.c (1.4) (+13 -3)
+		src/libgimpprintui2/printrcl.l (1.4) (+3 -2)
+		src/libgimpprintui2/printrcy.y (1.3) (+18 -2)
 		src/main/escp2-driver.c (1.22) (+6 -1)
 		src/main/print-escp2-data.c (1.159) (+131 -66)
 		src/main/print-escp2.c (1.325) (+35 -4)
@@ -2925,6 +4132,19 @@
 
 	Note 1002380.
 
+2004-08-03	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.72) (+2 -1)
+		src/libgimpprintui2/panel.c (1.6) (+2 -1)
+
+	1002380	Printing grayscale image w/old printrc file crashes at start
+
+2004-08-01	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.71) (+1 -2)
+
+	Remove stray debugging printf.
+
 2004-08-01	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.179) (+8 -8)
@@ -2975,12 +4195,38 @@
 
 2004-07-31	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui2/plist.c (1.3) (+5 -4)
+		src/libgimpprintui2/printrcl.l (1.3) (+18 -16)
+
+	Handle version 3 printrc correctly
+
+2004-07-31	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.150) (+3 -3)
 
 	Print newlines at the end of debug messages.
 
 2004-07-31	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.70) (+6 -1)
+
+	1000661	GIMP plugin does not refresh correctly in some cases
+
+2004-07-31	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui2/panel.c (1.5) (+6 -1)
+
+	1000661	GIMP plugin does not refresh preview correctly in some cases
+
+2004-07-31	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.69) (+4 -2)
+		src/libgimpprintui2/panel.c (1.4) (+2 -1)
+
+	1001029 Display problems w/preview - see description
+
+2004-07-31	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.149) (+5 -5)
 
 	Tentative fix for 982642 Canon 6200 Photo Ink Problems
@@ -3016,6 +4262,16 @@
 2004-07-24	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.111) (+6 -5)
+		include/gimp-print-ui2/.cvsignore (1.1) (added)
+		include/gimp-print-ui2/Makefile.am (1.3) (+23 -2)
+		include/gimp-print-ui2/curve.h (1.1) (added)
+		include/gimp-print-ui2/gammacurve.h (1.1) (added)
+		include/gimp-print-ui2/gimp-print-ui.h (1.3) (+5 -1)
+		src/libgimpprintui2/.cvsignore (1.2) (+4 -14)
+		src/libgimpprintui2/Makefile.am (1.4) (+21 -1)
+		src/libgimpprintui2/curve.c (1.1) (added)
+		src/libgimpprintui2/gammacurve.c (1.1) (added)
+		src/libgimpprintui2/panel.c (1.3) (+21 -20)
 
 	Add two new widgets: StpuiCurve and StpuiGammaCurve, based on the GTK+
 	GtkCurve and GtkGammaCurve widgets.
@@ -3032,7 +4288,7 @@
 	Files:	src/main/Makefile.am (1.86) (+2 -1)
 		src/main/dither-impl.h (1.23) (+4 -2)
 		src/main/dither-main.c (1.47) (+14 -5)
-		src/main/dither-predithered.c (1.1) ( )
+		src/main/dither-predithered.c (1.1) (added)
 		src/testpattern/run-testpattern (1.16) (+1 -1)
 
 	Add "predithered" dither algorithm
@@ -3070,6 +4326,7 @@
 2004-07-22	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.176) (+2 -0)
+		man/gimpprint-models.7.in (1.8) (+2 -1)
 		src/foomatic/foomatic-printermap (1.79) (+1 -0)
 		src/main/print-olympus.c (1.51) (+58 -3)
 		src/main/printers.xml (1.102) (+4 -1)
@@ -3079,6 +4336,7 @@
 2004-07-09	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.175) (+4 -1)
+		man/gimpprint-models.7.in (1.7) (+2 -1)
 		src/foomatic/foomatic-printermap (1.78) (+2 -0)
 		src/main/print-olympus.c (1.50) (+169 -33)
 		src/main/printers.xml (1.101) (+4 -1)
@@ -3091,6 +4349,12 @@
 
 	Update the British English translation.
 
+2004-07-02	<rlk@sourceforge.net>
+
+	Files:	src/main/libgimpprint.sym (1.5) (+279 -189)
+
+	Update the symbol list.
+
 2004-07-01	<m0m@sourceforge.net>
 
 	Files:	src/main/print-olympus.c (1.49) (+51 -54)
@@ -3100,6 +4364,7 @@
 2004-06-30	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.174) (+5 -0)
+		man/gimpprint-models.7.in (1.6) (+3 -1)
 		src/foomatic/foomatic-printermap (1.77) (+3 -0)
 		src/main/print-olympus.c (1.48) (+161 -9)
 		src/main/printers.xml (1.100) (+7 -1)
@@ -3156,6 +4421,7 @@
 		po/fr.po (1.56) (+458 -339)
 		po/ja.po (1.30) (+454 -337)
 		po/nl.po (1.36) (+452 -337)
+		po/no.po (1.56) (+439 -333)
 		po/pl.po (1.40) (+436 -333)
 		po/pt.po (1.34) (+460 -341)
 		po/sk.po (1.39) (+458 -339)
@@ -3165,12 +4431,25 @@
 
 2004-06-26	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui2/Makefile.am (1.3) (+1 -5)
+
+	Need to distribute gimpprintui2.pc.in.
+
+2004-06-26	<rlk@sourceforge.net>
+
 	Files:	doc/Makefile.am (1.35) (+2 -1)
+		doc/gimpprint.dox.in (1.5) (+1 -1)
 
 	Remove old gimpprint/html tree before regenerating it
 
 2004-06-26	<rlk@sourceforge.net>
 
+	Files:	doc/gimpprint.dox.in (1.4) (+1 -1)
+
+	Don't document xmli18n-tmp.h
+
+2004-06-26	<rlk@sourceforge.net>
+
 	Files:	src/main/print-olympus.c (1.46) (+3 -3)
 
 	Grab the right amount of data from the channel code.
@@ -3220,14 +4499,27 @@
 
 	Files:	configure.ac (1.109) (+51 -47)
 		include/Makefile.am (1.5) (+2 -2)
+		include/gimp-print-ui2/Makefile.am (1.2) (+40 -0)
+		include/gimp-print-ui2/gimp-print-ui.h (1.2) (+175 -0)
 		scripts/global.mk (1.7) (+5 -0)
 		src/Makefile.am (1.17) (+3 -1)
-		src/gimp2/.cvsignore (1.1) ( )
+		src/gimp2/.cvsignore (1.1) (added)
 		src/gimp2/Makefile.am (1.2) (+52 -0)
 		src/gimp2/print-image-gimp.c (1.2) (+447 -0)
 		src/gimp2/print-intl.h (1.2) (+38 -0)
 		src/gimp2/print.c (1.2) (+457 -0)
 		src/gimp2/print_gimp.h (1.2) (+55 -0)
+		src/libgimpprintui2/.cvsignore (1.1) (added)
+		src/libgimpprintui2/Makefile.am (1.2) (+80 -0)
+		src/libgimpprintui2/gimp-print-ui-internal.h (1.2) (+247 -0)
+		src/libgimpprintui2/gimpprintui2.pc.in (1.2) (+11 -0)
+		src/libgimpprintui2/panel.c (1.2) (+4730 -0)
+		src/libgimpprintui2/plist.c (1.2) (+1461 -0)
+		src/libgimpprintui2/print-image-thumbnail.c (1.2) (+130 -0)
+		src/libgimpprintui2/printrc.h (1.2) (+44 -0)
+		src/libgimpprintui2/printrcl.l (1.2) (+112 -0)
+		src/libgimpprintui2/printrcy.y (1.2) (+382 -0)
+		src/libgimpprintui2/ui-utils.c (1.2) (+881 -0)
 
 	Add GTK+ 2.0 port of libgimpprintui and the GIMP Print plugin.
 
@@ -3279,6 +4571,7 @@
 		src/cups/rastertoprinter.c (1.89) (+15 -2)
 		src/foomatic/foomatic-printermap (1.76) (+1 -1)
 		src/foomatic/printer_options.c (1.42) (+4 -1)
+		src/ghost/ijsgimpprint.c (1.53) (+56 -11)
 		src/main/print-pcl.c (1.134) (+230 -86)
 		src/main/printers.xml (1.99) (+7 -2)
 
@@ -3301,6 +4594,7 @@
 2004-06-17	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.168) (+5 -3)
+		man/gimpprint-models.7.in (1.5) (+5 -1)
 		src/foomatic/foomatic-printermap (1.75) (+2 -1)
 		src/main/print-olympus.c (1.43) (+33 -5)
 		src/main/printers.xml (1.97) (+5 -2)
@@ -3309,49 +4603,124 @@
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/print_gimp.h (1.1) ( )
+	Files:	src/libgimpprintui2/ui-utils.c (1.1) (added)
+
+	file ui-utils.c was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/printrcy.y (1.1) (added)
+
+	file printrcy.y was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/printrcl.l (1.1) (added)
+
+	file printrcl.l was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/printrc.h (1.1) (added)
+
+	file printrc.h was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/gimp2/print_gimp.h (1.1) (added)
 
 	file print_gimp.h was initially added on branch gtk2-20040615-branch.
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/print.c (1.1) ( )
+	Files:	src/gimp2/print.c (1.1) (added)
 
 	file print.c was initially added on branch gtk2-20040615-branch.
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/print-intl.h (1.1) ( )
+	Files:	src/gimp2/print-intl.h (1.1) (added)
 
 	file print-intl.h was initially added on branch gtk2-20040615-branch.
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/print-image-gimp.c (1.1) ( )
+	Files:	src/libgimpprintui2/print-image-thumbnail.c (1.1) (added)
+
+	file print-image-thumbnail.c was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/gimp2/print-image-gimp.c (1.1) (added)
 
 	file print-image-gimp.c was initially added on branch gtk2-20040615-branch.
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/Makefile.am (1.1) ( )
+	Files:	src/libgimpprintui2/plist.c (1.1) (added)
+
+	file plist.c was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/panel.c (1.1) (added)
+
+	file panel.c was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/gimpprintui2.pc.in (1.1) (added)
+
+	file gimpprintui2.pc.in was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui2/gimp-print-ui-internal.h (1.1) (added)
+
+	file gimp-print-ui-internal.h was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	src/gimp2/Makefile.am (1.1) (added)
+		src/libgimpprintui2/Makefile.am (1.1) (added)
+
+	file Makefile.am was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print-ui2/gimp-print-ui.h (1.1) (added)
+
+	file gimp-print-ui.h was initially added on branch gtk2-20040615-branch.
+
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print-ui2/Makefile.am (1.1) (added)
 
 	file Makefile.am was initially added on branch gtk2-20040615-branch.
 
 2004-06-13	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/plist.c (1.39) (+3 -3)
+
+	Don't choke if printrc file is trashed.
+
+2004-06-13	<rlk@sourceforge.net>
+
 	Files:	src/main/print-ps.c (1.78) (+11 -2)
 
 	972014 eksprx600_610.ppd crashes gimp-print-4.2.6-4
 
 2004-06-12	<rlk@sourceforge.net>
 
-	Files:	src/main/array.c (1.15) (+42 -2)
+	Files:	include/gimp-print/xml.h (1.7) (+3 -2)
+		src/main/array.c (1.15) (+42 -2)
 
 	Add stp_xmltree_create_from_array.
 
 2004-06-12	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.48) (+3 -3)
+	Files:	include/gimp-print/xml.h (1.6) (+6 -3)
+		src/main/curve.c (1.48) (+3 -3)
 		src/main/sequence.c (1.17) (+2 -2)
 
 	Export XML interchange for curves, and improve const-correctness.
@@ -3399,6 +4768,20 @@
 
 	Resample the gcr curve correctly.
 
+2004-06-07	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrcl.l (1.9) (+18 -16)
+
+	Print better debug info.
+
+	Accept file versions 2 and 3.
+
+2004-06-07	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/plist.c (1.38) (+4 -3)
+
+	Bump the file version so that earlier alpha releases won't get confused.
+
 2004-06-06	<rlk@sourceforge.net>
 
 	Files:	src/main/color-conversions.c (1.8) (+7 -4)
@@ -3434,7 +4817,7 @@
 	Files:	src/main/color-conversions.c (1.7) (+101 -80)
 		src/main/print-color.c (1.119) (+3 -2)
 		src/testpattern/Makefile.am (1.20) (+3 -3)
-		src/testpattern/run-testpattern-1 (1.1) ( )
+		src/testpattern/run-testpattern-1 (1.1) (added)
 		src/testpattern/testpattern.c (1.41) (+3 -3)
 
 	Fix up a few uses of lut->steps vs. 1 << bits.  They aren't always
@@ -3491,7 +4874,9 @@
 
 2004-05-30	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.47) (+46 -16)
+	Files:	include/gimp-print/curve.h (1.13) (+3 -4)
+		include/gimp-print/util.h (1.9) (+4 -3)
+		src/main/curve.c (1.47) (+46 -16)
 		src/main/print-canon.c (1.148) (+4 -4)
 		src/main/print-color.c (1.116) (+21 -7)
 		src/main/print-lexmark.c (1.146) (+4 -4)
@@ -3503,6 +4888,12 @@
 
 2004-05-26	<rleigh@sourceforge.net>
 
+	Files:	src/libgimpprintui/Makefile.am (1.11) (+2 -2)
+
+	Revert change to build only a static libgimpprintui.
+
+2004-05-26	<rleigh@sourceforge.net>
+
 	Files:	src/cups/genppd.c (1.97) (+13 -3)
 		src/main/path.c (1.13) (+11 -2)
 
@@ -3511,12 +4902,21 @@
 2004-05-26	<rlk@sourceforge.net>
 
 	Files:	src/gimp/print.c (1.62) (+2 -1)
+		src/libgimpprintui/panel.c (1.68) (+3 -2)
 
 	Fix a few memory leaks, tested with Valgrind
 
 2004-05-26	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.61) (+4 -1)
+	Files:	include/gimp-print-ui/gimp-print-ui.h (1.4) (+48 -6)
+		include/gimp-print/string-list.h (1.7) (+9 -4)
+		src/gimp/print.c (1.61) (+4 -1)
+		src/libgimpprintui/Makefile.am (1.10) (+3 -3)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.16) (+2 -1)
+		src/libgimpprintui/panel.c (1.67) (+256 -60)
+		src/libgimpprintui/plist.c (1.37) (+272 -255)
+		src/libgimpprintui/printrcl.l (1.8) (+9 -1)
+		src/libgimpprintui/printrcy.y (1.14) (+88 -6)
 		src/main/string-list.c (1.17) (+23 -13)
 
 	Revamp the command logic.  Rather than forcing the user to enter the
@@ -3528,7 +4928,13 @@
 
 2004-05-23	<rleigh@sourceforge.net>
 
-	Files:	src/main/printers.c (1.71) (+2 -2)
+	Files:	include/gimp-print/string-list.h (1.6) (+35 -13)
+		include/gimp-print/vars.h (1.14) (+3 -20)
+		src/ghost/ijsgimpprint.c (1.52) (+2 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.15) (+4 -4)
+		src/libgimpprintui/panel.c (1.66) (+6 -6)
+		src/libgimpprintui/ui-utils.c (1.9) (+2 -2)
+		src/main/printers.c (1.71) (+2 -2)
 		src/main/string-list.c (1.16) (+16 -14)
 
 	Change stp_string_list_t to use the new-style forward declared struct and
@@ -3536,6 +4942,24 @@
 
 2004-05-23	<rleigh@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.9) (+3 -4)
+		debian/changelog (1.63) (+11 -0)
+		debian/control.in (1.40) (+0 -47)
+		debian/cupsys-driver-gimpprint.dirs (1.2) (removed)
+		debian/cupsys-driver-gimpprint.postrm (1.5) (+3 -1)
+		debian/cupsys-driver-gimpprint.prerm (1.2) (removed)
+		debian/libgimpprint-doc.doc-base.developer.in (1.1) (added)
+		debian/libgimpprint-doc.doc-base.in (1.4) (removed)
+		debian/libgimpprint-doc.doc-base.reference.in (1.1) (added)
+		debian/libgimpprint-doc.install.in (1.4) (+2 -2)
+		debian/libgimpprintui-dev.install (1.4) (removed)
+		debian/libgimpprintui.install (1.2) (removed)
+		debian/rules (1.53) (+18 -21)
+
+	Update Debian packaging for 5.0.0-alpha3.
+
+2004-05-23	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.105) (+7 -3)
 
 	Determine the module path correctly.  Previously, this would be set
@@ -3552,7 +4976,10 @@
 2004-05-23	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.104) (+12 -25)
+		src/libgimpprintui/Makefile.am (1.9) (+3 -7)
+		src/libgimpprintui/gimpprintui.pc.in (1.1) (added)
 		src/main/Makefile.am (1.85) (+1 -4)
+		src/main/gimpprint.pc.in (1.3) (+3 -3)
 
 	Fix VPATH build.
 	Don't generate pkg-config templates, since this breaks VPATH builds with
@@ -3575,6 +5002,12 @@
 	Tighten GIMP 1.2 version checking so that even if forced, it will not
 	be possible to build the GIMP 1.2 plugin if a version > 1.2 is found.
 
+2004-05-18	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/plist.c (1.36) (+10 -3)
+
+	955436 gimp plugin save printc with wrong locale
+
 2004-05-17	<davehill@sourceforge.net>
 
 	Files:	src/gimp/print.c (1.60) (+2 -1)
@@ -3589,7 +5022,9 @@
 
 2004-05-16	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.46) (+435 -73)
+	Files:	include/gimp-print/curve.h (1.12) (+87 -31)
+		include/gimp-print/util.h (1.8) (+13 -11)
+		src/main/curve.c (1.46) (+435 -73)
 		test/curve.c (1.20) (+608 -194)
 
 	Support piecewise curves
@@ -3605,6 +5040,7 @@
 		po/fr.po (1.55) (+628 -650)
 		po/ja.po (1.29) (+628 -650)
 		po/nl.po (1.35) (+628 -650)
+		po/no.po (1.55) (+628 -650)
 		po/pl.po (1.39) (+628 -650)
 		po/pt.po (1.33) (+628 -650)
 		po/sk.po (1.38) (+628 -650)
@@ -3624,6 +5060,12 @@
 
 	Add check for pkg-config.
 
+2004-05-11	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrcy.y (1.13) (+3 -1)
+
+	Fix a few errors
+
 2004-05-10	<rleigh@sourceforge.net>
 
 	Files:	doc/README.maintaining (1.18) (+5 -1)
@@ -3649,6 +5091,22 @@
 	Files:	Makefile.am (1.141) (+2 -2)
 		configure.ac (1.103) (+6 -21)
 		doc/README.maintaining (1.17) (+5 -17)
+		include/gimp-print/curve.h (1.11) (+7 -2)
+		include/gimp-print/util.h (1.7) (+5 -4)
+		include/gimp-print/vars.h (1.13) (+4 -1)
+		lib/.cvsignore (1.6) (removed)
+		lib/Makefile.am (1.6) (removed)
+		lib/alloca.c (1.2) (removed)
+		lib/getopt.c (1.2) (removed)
+		lib/getopt.h (1.2) (removed)
+		lib/getopt1.c (1.2) (removed)
+		lib/libprintut.h (1.8) (removed)
+		lib/pathmax.h (1.2) (removed)
+		lib/strcspn.c (1.2) (removed)
+		lib/vasprintf.c (1.5) (removed)
+		lib/xgetcwd.c (1.3) (removed)
+		lib/xmalloc.c (1.5) (removed)
+		lib/xmalloc.h (1.6) (removed)
 		po/POTFILES.in (1.19) (+0 -9)
 		scripts/global.mk (1.6) (+0 -1)
 		src/cups/Makefile.am (1.76) (+7 -7)
@@ -3657,14 +5115,22 @@
 		src/escputil/Makefile.am (1.16) (+1 -1)
 		src/escputil/escputil.c (1.62) (+9 -10)
 		src/foomatic/Makefile.am (1.42) (+6 -6)
+		src/foomatic/gimp-print-version.c (1.3) (+1 -2)
 		src/foomatic/paper_sizes.c (1.7) (+1 -2)
 		src/foomatic/printer_margins.c (1.14) (+1 -2)
 		src/foomatic/printer_options.c (1.41) (+1 -2)
 		src/foomatic/printers.c (1.9) (+1 -2)
 		src/ghost/Makefile.am (1.34) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.51) (+15 -15)
 		src/gimp/Makefile.am (1.34) (+2 -2)
 		src/gimp/print-image-gimp.c (1.13) (+9 -10)
 		src/gimp/print.c (1.59) (+3 -4)
+		src/libgimpprintui/panel.c (1.65) (+9 -10)
+		src/libgimpprintui/plist.c (1.35) (+24 -25)
+		src/libgimpprintui/print-image-thumbnail.c (1.6) (+3 -4)
+		src/libgimpprintui/printrcl.l (1.7) (+1 -2)
+		src/libgimpprintui/printrcy.y (1.12) (+1 -2)
+		src/libgimpprintui/ui-utils.c (1.8) (+2 -3)
 		src/main/path.c (1.12) (+3 -3)
 		src/main/print-lexmark.c (1.145) (+5 -5)
 		src/main/print-util.c (1.105) (+4 -4)
@@ -3699,6 +5165,7 @@
 
 	Files:	NEWS (1.164) (+32 -8)
 		README (1.138) (+10 -10)
+		debian/README.Debian (1.53) (+1 -1)
 
 	Update information
 
@@ -3708,6 +5175,12 @@
 
 	855685 escputil does not return status for C84
 
+2004-05-08	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/module.h (1.2) (+7 -7)
+
+	Module functions should be declared extern.
+
 2004-05-07	<rlk@sourceforge.net>
 
 	Files:	src/testpattern/testpatterny.y (1.24) (+2 -2)
@@ -3716,12 +5189,32 @@
 
 2004-05-07	<rleigh@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.95) (+8 -8)
+	Files:	include/gimp-print-ui/gimp-print-ui.h (1.3) (+2 -2)
+		include/gimp-print/array.h (1.9) (+15 -16)
+		include/gimp-print/channel.h (1.2) (+12 -12)
+		include/gimp-print/color.h (1.6) (+10 -10)
+		include/gimp-print/curve-cache.h (1.2) (+5 -5)
+		include/gimp-print/curve.h (1.10) (+49 -50)
+		include/gimp-print/dither.h (1.3) (+25 -25)
+		include/gimp-print/list.h (1.3) (+10 -10)
+		include/gimp-print/paper.h (1.4) (+3 -3)
+		include/gimp-print/printers.h (1.6) (+34 -35)
+		include/gimp-print/sequence.h (1.7) (+33 -34)
+		include/gimp-print/util.h (1.6) (+18 -18)
+		include/gimp-print/vars.h (1.12) (+129 -126)
+		include/gimp-print/weave.h (1.3) (+15 -15)
+		include/gimp-print/xml.h (1.5) (+5 -5)
+		src/cups/genppd.c (1.95) (+8 -8)
 		src/cups/rastertoprinter.c (1.87) (+12 -12)
 		src/escputil/escputil.c (1.60) (+8 -8)
 		src/foomatic/printer_margins.c (1.13) (+3 -3)
 		src/foomatic/printer_options.c (1.40) (+3 -3)
 		src/foomatic/printers.c (1.8) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.50) (+11 -11)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.14) (+3 -3)
+		src/libgimpprintui/panel.c (1.64) (+18 -18)
+		src/libgimpprintui/plist.c (1.34) (+9 -9)
+		src/libgimpprintui/printrcy.y (1.11) (+2 -2)
 		src/main/array.c (1.14) (+70 -94)
 		src/main/bit-ops.c (1.6) (+3 -3)
 		src/main/channel.c (1.14) (+16 -16)
@@ -3783,6 +5276,12 @@
 
 2004-05-01	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.63) (+5 -7)
+
+	Return FALSE from idle functions rather than yanking them.
+
+2004-05-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.320) (+3 -3)
 
 	Offer the effective printing resolution (vs. the physical printer
@@ -3797,6 +5296,12 @@
 
 2004-05-01	<rlk@sourceforge.net>
 
+	Files:	po/hu.po (1.1) (added)
+
+	file hu.po was initially added on branch gimp-print-4_2_branch.
+
+2004-05-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.146) (+2 -2)
 		src/main/print-escp2.c (1.319) (+3 -3)
 		src/main/print-lexmark.c (1.143) (+2 -2)
@@ -3804,6 +5309,12 @@
 
 	Avoid depending upon possibly unset strings
 
+2004-05-01	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.62) (+41 -11)
+
+	Make sure printing mode is always set when necessary.
+
 2004-04-30	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.102) (+42 -6)
@@ -3818,6 +5329,15 @@
 
 	Files:	NEWS (1.163) (+49 -9)
 		configure.ac (1.101) (+4 -4)
+		include/gimp-print/color.h (1.5) (+2 -5)
+		include/gimp-print/dither.h (1.2) (+25 -25)
+		include/gimp-print/list.h (1.2) (+15 -15)
+		include/gimp-print/mxml.h (1.2) (+69 -69)
+		include/gimp-print/string-list.h (1.5) (+4 -2)
+		include/gimp-print/util.h (1.5) (+3 -3)
+		include/gimp-print/weave.h (1.2) (+3 -3)
+		include/gimp-print/xml.h (1.4) (+8 -8)
+		src/libgimpprintui/plist.c (1.33) (+11 -11)
 		src/main/array.c (1.13) (+6 -6)
 		src/main/channel.c (1.12) (+6 -6)
 		src/main/color.c (1.8) (+1 -6)
@@ -3872,14 +5392,43 @@
 
 2004-04-25	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.83) (+3 -15)
+	Files:	doc/gimpprint.dox.in (1.3) (+2 -2)
+		include/gimp-print/Makefile.am (1.15) (+13 -2)
+		include/gimp-print/array.h (1.8) (+4 -4)
+		include/gimp-print/bit-ops.h (1.1) (added)
+		include/gimp-print/channel.h (1.1) (added)
+		include/gimp-print/color.h (1.4) (+53 -10)
+		include/gimp-print/curve-cache.h (1.1) (added)
+		include/gimp-print/curve.h (1.9) (+5 -5)
+		include/gimp-print/dither.h (1.1) (added)
+		include/gimp-print/gimp-print-intl-internal.h (1.4) (+4 -4)
+		include/gimp-print/gimp-print-intl.h (1.5) (+4 -4)
+		include/gimp-print/gimp-print-module.h (1.1) (added)
+		include/gimp-print/gimp-print.h (1.40) (+5 -5)
+		include/gimp-print/image.h (1.6) (+14 -5)
+		include/gimp-print/list.h (1.1) (added)
+		include/gimp-print/module.h (1.1) (added)
+		include/gimp-print/mxml.h (1.1) (added)
+		include/gimp-print/paper.h (1.3) (+10 -5)
+		include/gimp-print/path.h (1.1) (added)
+		include/gimp-print/printers.h (1.5) (+46 -5)
+		include/gimp-print/sequence.h (1.6) (+4 -4)
+		include/gimp-print/string-list.h (1.4) (+5 -5)
+		include/gimp-print/util.h (1.4) (+88 -5)
+		include/gimp-print/vars.h (1.11) (+34 -4)
+		include/gimp-print/weave.h (1.1) (added)
+		include/gimp-print/xml.h (1.3) (+34 -15)
+		src/main/Makefile.am (1.83) (+3 -15)
 		src/main/array.c (1.12) (+13 -14)
 		src/main/bit-ops.c (1.5) (+92 -94)
+		src/main/bit-ops.h (1.2) (removed)
 		src/main/channel.c (1.11) (+53 -53)
 		src/main/color-conversion.h (1.2) (+7 -6)
 		src/main/color-conversions.c (1.2) (+82 -84)
 		src/main/color.c (1.7) (+72 -73)
+		src/main/color.h (1.17) (removed)
 		src/main/curve-cache.c (1.3) (+16 -16)
+		src/main/curve-cache.h (1.2) (removed)
 		src/main/curve.c (1.43) (+96 -97)
 		src/main/dither-ed.c (1.15) (+5 -5)
 		src/main/dither-eventone.c (1.37) (+15 -15)
@@ -3887,16 +5436,22 @@
 		src/main/dither-main.c (1.43) (+55 -56)
 		src/main/dither-ordered.c (1.15) (+2 -2)
 		src/main/dither-very-fast.c (1.13) (+4 -4)
+		src/main/dither.h (1.24) (removed)
 		src/main/escp2-driver.c (1.20) (+87 -88)
 		src/main/generic-options.c (1.6) (+3 -3)
 		src/main/generic-options.h (1.3) (+2 -2)
+		src/main/gimp-print-internal.h (1.71) (+4 -7)
 		src/main/image.c (1.5) (+8 -8)
+		src/main/image.h (1.5) (removed)
 		src/main/module.c (1.23) (+94 -96)
+		src/main/module.h (1.6) (removed)
 		src/main/mxml-attr.c (1.5) (+3 -3)
 		src/main/mxml-file.c (1.5) (+3 -3)
 		src/main/mxml-node.c (1.5) (+3 -3)
 		src/main/mxml-search.c (1.5) (+3 -3)
+		src/main/mxml.h (1.5) (removed)
 		src/main/path.c (1.11) (+22 -23)
+		src/main/path.h (1.4) (removed)
 		src/main/print-canon.c (1.144) (+114 -115)
 		src/main/print-color.c (1.113) (+69 -71)
 		src/main/print-dither-matrices.c (1.31) (+102 -104)
@@ -3913,10 +5468,14 @@
 		src/main/print-vars.c (1.69) (+257 -258)
 		src/main/print-weave.c (1.59) (+182 -184)
 		src/main/printers.c (1.68) (+165 -167)
+		src/main/printers.h (1.14) (removed)
 		src/main/sequence.c (1.14) (+46 -47)
 		src/main/string-list.c (1.15) (+21 -21)
 		src/main/util.h (1.31) (+15 -138)
+		src/main/vars.h (1.17) (removed)
+		src/main/weave.h (1.11) (removed)
 		src/main/xml.c (1.30) (+77 -80)
+		src/main/xml.h (1.11) (removed)
 		test/escp2-weavetest.c (1.32) (+8 -9)
 		test/testdither.c (1.43) (+52 -55)
 
@@ -3937,9 +5496,21 @@
 
 	939342 PPD files not Adobe compliant
 
+2004-04-18	<rlk@sourceforge.net>
+
+	Files:	src/main/color.h (1.16) (+1 -15)
+
+	Remove obsolete (and #ifdef'ed out) enum.
+
 2004-04-17	<rlk@sourceforge.net>
 
-	Files:	po/nb.po (1.1) ( )
+	Files:	po/uk.po (1.1) (added)
+
+	file uk.po was initially added on branch gimp-print-4_2_branch.
+
+2004-04-17	<rlk@sourceforge.net>
+
+	Files:	po/nb.po (1.1) (added)
 
 	file nb.po was initially added on branch gimp-print-4_2_branch.
 
@@ -3970,18 +5541,25 @@
 
 2004-04-13	<rlk@sourceforge.net>
 
-	Files:	doc/5.0-release-plan.txt (1.1) ( )
+	Files:	doc/5.0-release-plan.txt (1.1) (added)
 
 	Check in initial 5.0 release plan.
 
 2004-04-13	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.92) (+21 -21)
+	Files:	include/gimp-print/curve.h (1.8) (+3 -3)
+		include/gimp-print/string-list.h (1.3) (+3 -3)
+		include/gimp-print/vars.h (1.10) (+5 -5)
+		src/cups/genppd.c (1.92) (+21 -21)
 		src/cups/rastertoprinter.c (1.84) (+10 -10)
 		src/escputil/escputil.c (1.59) (+3 -3)
 		src/foomatic/printer_margins.c (1.12) (+4 -4)
 		src/foomatic/printer_options.c (1.38) (+5 -5)
+		src/ghost/ijsgimpprint.c (1.49) (+6 -6)
 		src/gimp/print.c (1.58) (+2 -2)
+		src/libgimpprintui/panel.c (1.61) (+22 -22)
+		src/libgimpprintui/plist.c (1.32) (+10 -10)
+		src/libgimpprintui/printrcy.y (1.10) (+2 -2)
 		src/main/curve-cache.c (1.2) (+2 -2)
 		src/main/curve.c (1.42) (+6 -6)
 		src/main/escp2-driver.c (1.19) (+2 -2)
@@ -4020,6 +5598,28 @@
 
 2004-04-11	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/image.h (1.5) (+3 -3)
+		include/gimp-print/printers.h (1.4) (+3 -3)
+
+	Doxygen
+
+2004-04-11	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/vars.h (1.9) (+8 -6)
+
+	Minor doc improvement.
+
+2004-04-11	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h (1.39) (+8 -2)
+		include/gimp-print/image.h (1.4) (+72 -42)
+		include/gimp-print/printers.h (1.3) (+130 -20)
+		include/gimp-print/vars.h (1.8) (+2 -2)
+
+	Document with Doxygen.
+
+2004-04-11	<rlk@sourceforge.net>
+
 	Files:	po/cs.po (1.19) (+991 -778)
 		po/da.po (1.47) (+960 -774)
 		po/de.po (1.33) (+987 -783)
@@ -4029,6 +5629,7 @@
 		po/fr.po (1.54) (+991 -783)
 		po/ja.po (1.28) (+991 -782)
 		po/nl.po (1.34) (+985 -784)
+		po/no.po (1.54) (+983 -780)
 		po/pl.po (1.38) (+969 -775)
 		po/pt.po (1.32) (+991 -782)
 		po/sk.po (1.37) (+991 -783)
@@ -4044,6 +5645,13 @@
 
 2004-04-11	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/util.h (1.3) (+3 -3)
+		include/gimp-print/vars.h (1.7) (+2 -2)
+
+	Doxygen
+
+2004-04-11	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.162) (+146 -77)
 		README (1.137) (+22 -4)
 
@@ -4072,9 +5680,10 @@
 
 	Files:	src/main/.cvsignore (1.20) (+2 -0)
 		src/main/Makefile.am (1.82) (+8 -2)
-		src/main/color-conversion.h (1.1) ( )
-		src/main/color-conversions.c (1.1) ( )
-		src/main/curve-cache.c (1.1) ( )
+		src/main/color-conversion.h (1.1) (added)
+		src/main/color-conversions.c (1.1) (added)
+		src/main/curve-cache.c (1.1) (added)
+		src/main/curve-cache.h (1.1) (added)
 		src/main/print-color.c (1.111) (+31 -2577)
 
 	Split color conversion functions off from color core and curve cache.
@@ -4085,6 +5694,13 @@
 
 	Reduce the number of "noise" calls to get the weave parameters.
 
+2004-04-10	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/util.h (1.2) (+30 -6)
+		include/gimp-print/vars.h (1.6) (+890 -171)
+
+	Document with Doxygen.
+
 2004-04-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.161) (+7 -6)
@@ -4106,10 +5722,26 @@
 
 2004-04-10	<rlk@sourceforge.net>
 
+	Files:	src/ghost/ijsgimpprint.c (1.48) (+3 -2)
+
+	Don't attempt to end job if something fails.
+
+2004-04-10	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print-version.h.in (1.4) (+2 -2)
+
+	Doxygen fix
+
+2004-04-10	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.160) (+11 -5)
+		include/gimp-print/color.h (1.3) (+3 -3)
+		include/gimp-print/vars.h (1.5) (+6 -11)
 		src/cups/genppd.c (1.91) (+3 -3)
 		src/cups/rastertoprinter.c (1.83) (+3 -3)
 		src/foomatic/printer_options.c (1.36) (+23 -2)
+		src/ghost/ijsgimpprint.c (1.47) (+71 -16)
+		src/libgimpprintui/panel.c (1.60) (+9 -8)
 		src/main/dither-main.c (1.42) (+3 -3)
 		src/main/generic-options.c (1.5) (+17 -4)
 		src/main/print-canon.c (1.142) (+15 -15)
@@ -4134,6 +5766,33 @@
 
 	Fix up a few filenames for doxygen.
 
+2004-04-08	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print-intl-internal.h (1.3) (+26 -1)
+		include/gimp-print/gimp-print-intl.h (1.4) (+24 -2)
+		include/gimp-print/gimp-print-version.h.in (1.3) (+33 -4)
+
+	Document with Doxygen.
+
+2004-04-08	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.62) (+6 -0)
+
+	Update version number for 5.0.0-alpha2
+
+2004-04-07	<rleigh@sourceforge.net>
+
+	Files:	doc/gimpprint.dox.in (1.2) (+7 -7)
+
+	Turn off unused C++-specific options.
+
+2004-04-07	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/color.h (1.2) (+47 -8)
+		include/gimp-print/paper.h (1.2) (+62 -11)
+
+	Document with Doxygen.
+
 2004-04-07	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.48) (+1 -1)
@@ -4143,7 +5802,7 @@
 2004-04-07	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.47) (+21 -11)
-		src/foomatic/foomatic-templates-ijs/RenderResolution.xml (1.1) ( )
+		src/foomatic/foomatic-templates-ijs/RenderResolution.xml (1.1) (added)
 		src/foomatic/foomatic-templates-ijs/Resolution.xml (1.4) (+6 -6)
 
 	Added option for the printer resolution, made rendering resolution the
@@ -4155,15 +5814,29 @@
 
 	Color conversion name should *not* be translated.
 
+2004-04-06	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/curve.h (1.7) (+436 -130)
+
+	Document with Doxygen.
+
+2004-04-06	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/array.h (1.7) (+2 -2)
+
+	Correct a typo.
+
 2004-04-04	<rleigh@sourceforge.net>
 
 	Files:	m4/gimp.m4 (1.3) (+7 -7)
+		m4extra/gimp.m4 (1.2) (removed)
 
 	Add modified gimp.m4, so gimptool-1.2 is found rather than gimptool.
 
 2004-04-04	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.159) (+4 -0)
+		include/gimp-print/curve.h (1.6) (+3 -2)
 		src/main/color.c (1.6) (+14 -13)
 		src/main/curve.c (1.41) (+26 -5)
 		src/main/escp2-driver.c (1.18) (+2 -2)
@@ -4192,6 +5865,14 @@
 
 2004-04-02	<rlk@sourceforge.net>
 
+	Files:	src/ghost/ijsgimpprint.c (1.46) (+14 -5)
+
+	Fix a few fallthroughs that shouldn't.
+
+	Constrain the width to the page width.
+
+2004-04-02	<rlk@sourceforge.net>
+
 	Files:	src/main/printers.c (1.63) (+17 -3)
 
 	Add a bit more debugging info
@@ -4217,8 +5898,15 @@
 
 2004-04-01	<rlk@sourceforge.net>
 
+	Files:	cups-gimpprint.list.in (1.3) (+7 -3)
+
+	Partially fix this
+
+2004-04-01	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.158) (+107 -31)
 		README (1.135) (+12 -16)
+		debian/README.Debian (1.52) (+1 -1)
 
 	Prep for 5.0 alpha 2
 
@@ -4253,6 +5941,12 @@
 
 	Don't offer red and blue channels if we're not using them.
 
+2004-03-29	<rleigh@sourceforge.net>
+
+	Files:	doc/gimpprint.dox.in (1.1) (added)
+
+	Add doxygen config file for generating API documentation.
+
 2004-03-29	<rlk@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.108) (+96 -24)
@@ -4271,8 +5965,13 @@
 
 	Files:	Makefile.am (1.139) (+1 -1)
 		configure.ac (1.97) (+9 -20)
+		debian/rules (1.52) (+1 -1)
 		doc/developer/Makefile.am (1.13) (+1 -1)
 		doc/users_guide/Makefile.am (1.40) (+1 -1)
+		include/gimp-print-ui/gimp-print-ui.h (1.2) (+18 -2)
+		include/gimp-print/image.h (1.3) (+6 -108)
+		include/gimp-print/string-list.h (1.2) (+3 -3)
+		include/gimp-print/vars.h (1.4) (+27 -51)
 		m4/stp_option.m4 (1.4) (+42 -0)
 		scripts/autogen.sh (1.30) (+1 -0)
 		src/cups/cups-genppdconfig.in (1.8) (+1 -1)
@@ -4282,12 +5981,20 @@
 		src/foomatic/foomatic-generator.in (1.45) (+2 -2)
 		src/foomatic/printer_margins.c (1.11) (+11 -1)
 		src/foomatic/printer_options.c (1.33) (+15 -3)
+		src/ghost/ijsgimpprint.c (1.45) (+13 -28)
 		src/gimp/print-image-gimp.c (1.12) (+153 -162)
 		src/gimp/print.c (1.57) (+26 -5)
 		src/gimp/print_gimp.h (1.43) (+2 -2)
+		src/libgimpprintui/Makefile.am (1.8) (+1 -1)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.13) (+2 -2)
+		src/libgimpprintui/panel.c (1.59) (+134 -98)
+		src/libgimpprintui/plist.c (1.31) (+77 -10)
+		src/libgimpprintui/print-image-thumbnail.c (1.5) (+5 -29)
+		src/libgimpprintui/printrcy.y (1.9) (+16 -2)
 		src/main/Makefile.am (1.81) (+1 -1)
 		src/main/channel.c (1.10) (+17 -6)
 		src/main/color.c (1.5) (+2 -2)
+		src/main/color.h (1.15) (+16 -3)
 		src/main/dither-main.c (1.40) (+3 -4)
 		src/main/escp2-channels.c (1.36) (+14 -14)
 		src/main/escp2-driver.c (1.17) (+1 -4)
@@ -4297,6 +6004,7 @@
 		src/main/generic-options.c (1.4) (+55 -2)
 		src/main/generic-options.h (1.2) (+13 -1)
 		src/main/image.c (1.4) (+4 -73)
+		src/main/image.h (1.4) (+3 -15)
 		src/main/print-canon.c (1.141) (+75 -34)
 		src/main/print-color.c (1.107) (+2460 -908)
 		src/main/print-escp2-data.c (1.155) (+2 -2)
@@ -4312,9 +6020,11 @@
 		src/main/print-vars.c (1.64) (+64 -192)
 		src/main/print-weave.c (1.57) (+5 -4)
 		src/main/printers.c (1.62) (+185 -101)
+		src/main/printers.h (1.13) (+5 -2)
 		src/main/printers.xml (1.95) (+1 -242)
 		src/main/sequence.c (1.12) (+12 -7)
 		src/main/string-list.c (1.13) (+5 -5)
+		src/main/vars.h (1.16) (+13 -5)
 		src/testpattern/testpattern.c (1.36) (+149 -174)
 		src/testpattern/testpattern.h (1.13) (+4 -4)
 		src/testpattern/testpatternl.l (1.11) (+3 -2)
@@ -4348,6 +6058,8 @@
 
 	Files:	configure.ac (1.96) (+10 -3)
 		doc/Makefile.am (1.33) (+29 -5)
+		include/gimp-print/array.h (1.6) (+109 -7)
+		include/gimp-print/sequence.h (1.5) (+286 -12)
 		src/main/array.c (1.11) (+3 -5)
 
 	Add support for generating API documentation with doxygen.
@@ -4404,13 +6116,15 @@
 
 2004-03-16	<rlk@sourceforge.net>
 
-	Files:	src/main/print-olympus.c (1.35) (+18 -11)
+	Files:	src/libgimpprintui/panel.c (1.58) (+7 -2)
+		src/main/print-olympus.c (1.35) (+18 -11)
 
 	916809 Default paper size is "Custom" for some printers
 
 2004-03-16	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.80) (+2 -2)
+	Files:	src/libgimpprintui/Makefile.am (1.7) (+2 -2)
+		src/main/Makefile.am (1.80) (+2 -2)
 
 	Force deletion of files to be removed.
 
@@ -4422,6 +6136,21 @@
 
 2004-03-16	<rleigh@sourceforge.net>
 
+	Files:	debian/README.building (1.7) (+2 -1)
+		debian/changelog (1.61) (+14 -0)
+		debian/control.in (1.39) (+8 -9)
+		debian/copyright (1.7) (+8 -6)
+		debian/libgimpprint-doc.doc-base.in (1.3) (+1 -1)
+		debian/libgimpprint-doc.install.in (1.3) (+1 -1)
+		debian/rules (1.51) (+3 -5)
+
+	Fix up libgimpprint-doc manual.
+	Small changes to build instructions.
+	Update build-dependencies.
+	Add GFDL to copyright.
+
+2004-03-16	<rleigh@sourceforge.net>
+
 	Files:	doc/developer/Makefile.am (1.12) (+15 -10)
 
 	Distribute gimpprint.pdf.
@@ -4445,8 +6174,8 @@
 2004-03-14	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.40) (+104 -14)
-		src/foomatic/foomatic-templates-ijs/NumericalOptions.xml (1.1) ( )
-		src/foomatic/foomatic-templates-ijs/OtherOptions.xml (1.1) ( )
+		src/foomatic/foomatic-templates-ijs/NumericalOptions.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/OtherOptions.xml (1.1) (added)
 		src/foomatic/printer_margins.c (1.10) (+5 -1)
 		src/foomatic/printer_options.c (1.29) (+7 -5)
 
@@ -4457,6 +6186,7 @@
 	Files:	src/foomatic/.cvsignore (1.8) (+0 -1)
 		src/foomatic/Makefile.am (1.40) (+2 -5)
 		src/foomatic/foomatic-generator.in (1.39) (+0 -9)
+		src/foomatic/stp_limits.c (1.11) (removed)
 
 	Remove obsolete stp_limits
 
@@ -4578,15 +6308,30 @@
 
 	Files:	doc/developer/.cvsignore (1.4) (+2 -9)
 		doc/developer/Makefile.am (1.10) (+99 -99)
-		doc/developer/copying.xml (1.1) ( )
-		doc/developer/dither.xml (1.1) ( )
-		doc/developer/escp2.xml (1.1) ( )
-		doc/developer/gpl-appendix.xml (1.1) ( )
-		doc/developer/introduction.xml (1.1) ( )
-		doc/developer/new-printer.xml (1.1) ( )
-		doc/developer/problems.xml (1.1) ( )
-		doc/developer/using.xml (1.1) ( )
-		doc/developer/weave.xml (1.1) ( )
+		doc/developer/copying.texi (1.3) (removed)
+		doc/developer/copying.xml (1.1) (added)
+		doc/developer/dither.texi (1.2) (removed)
+		doc/developer/dither.xml (1.1) (added)
+		doc/developer/escp2.texi (1.5) (removed)
+		doc/developer/escp2.xml (1.1) (added)
+		doc/developer/functions.texi (1.6) (removed)
+		doc/developer/gimpprint.texi (1.3) (removed)
+		doc/developer/gimpprint.xml (1.1) (added)
+		doc/developer/gpl-appendix.xml (1.1) (added)
+		doc/developer/gpl.texi (1.2) (removed)
+		doc/developer/indices.texi (1.2) (removed)
+		doc/developer/integrating.texi (1.5) (removed)
+		doc/developer/introduction.texi (1.3) (removed)
+		doc/developer/introduction.xml (1.1) (added)
+		doc/developer/new-printer.texi (1.4) (removed)
+		doc/developer/new-printer.xml (1.1) (added)
+		doc/developer/overview.texi (1.3) (removed)
+		doc/developer/problems.texi (1.3) (removed)
+		doc/developer/problems.xml (1.1) (added)
+		doc/developer/using.texi (1.3) (removed)
+		doc/developer/using.xml (1.1) (added)
+		doc/developer/weave.texi (1.4) (removed)
+		doc/developer/weave.xml (1.1) (added)
 
 	Replace the Texinfo developer's reference with a new DocBook/XML version.
 	Currently HTML and PDF output is available in the Makefile, HTML being
@@ -4638,10 +6383,25 @@
 
 	Files:	AUTHORS (1.17) (+1 -1)
 		doc/README.maintaining (1.16) (+4 -4)
+		include/gimp-print/array.h (1.5) (+2 -2)
+		include/gimp-print/sequence.h (1.4) (+2 -2)
+		m4/stp_path_lib.m4 (1.3) (+2 -2)
+		m4/stp_pkgconfig.m4 (1.5) (+2 -2)
 		man/cups-calibrate.8.in (1.7) (+3 -3)
 		man/cups-genppd.8.in (1.4) (+3 -3)
 		man/cups-genppdconfig.8.in (1.5) (+4 -4)
 		man/cups-genppdupdate.8.in (1.3) (+4 -4)
+		man/gimpprint-color.7.in (1.3) (+3 -3)
+		man/gimpprint-dithers.7.in (1.3) (+3 -3)
+		man/gimpprint-imagetypes.7.in (1.4) (+3 -3)
+		man/gimpprint-inktypes.7.in (1.3) (+3 -3)
+		man/gimpprint-mediasizes.7.in (1.3) (+3 -3)
+		man/gimpprint-mediasources.7.in (1.3) (+3 -3)
+		man/gimpprint-mediatypes.7.in (1.3) (+3 -3)
+		man/gimpprint-models.7.in (1.4) (+3 -3)
+		man/gimpprint-resolutions.7.in (1.5) (+3 -3)
+		man/gimpprint.3.in (1.7) (+3 -3)
+		man/ijsgimpprint.1.in (1.7) (+3 -3)
 		po/cs.po (1.18) (+326 -277)
 		po/da.po (1.46) (+320 -277)
 		po/de.po (1.32) (+324 -277)
@@ -4651,6 +6411,7 @@
 		po/fr.po (1.53) (+326 -277)
 		po/ja.po (1.27) (+326 -277)
 		po/nl.po (1.33) (+326 -277)
+		po/no.po (1.53) (+323 -277)
 		po/pl.po (1.37) (+322 -278)
 		po/pt.po (1.31) (+326 -277)
 		po/sk.po (1.36) (+326 -277)
@@ -4659,11 +6420,16 @@
 		src/cups/cups-genppdupdate.in (1.13) (+2 -2)
 		src/main/array.c (1.10) (+2 -2)
 		src/main/color.c (1.4) (+2 -2)
+		src/main/gimpprint.dtd (1.6) (+2 -2)
+		src/main/gimpprint.xsd (1.7) (+2 -2)
 		src/main/module.c (1.21) (+2 -2)
+		src/main/module.h (1.5) (+2 -2)
 		src/main/path.c (1.9) (+2 -2)
+		src/main/path.h (1.3) (+3 -3)
 		src/main/print-list.c (1.14) (+2 -2)
 		src/main/sequence.c (1.11) (+2 -2)
 		src/main/xml.c (1.28) (+2 -2)
+		src/main/xml.h (1.10) (+3 -3)
 
 	Change my email address from "roger@whinlatter.uklinux.net" to
 	"rleigh@debian.org".  The former address will be moved to
@@ -4678,9 +6444,30 @@
 	resolve symbols exported from libgimpprint (the executable does not
 	have a dynamic symbol table).
 
+2004-02-08	<rleigh@sourceforge.net>
+
+	Files:	debian/README.Debian (1.51) (+2 -2)
+		debian/README.building (1.6) (+1 -1)
+		debian/changelog (1.60) (+7 -0)
+		debian/control.in (1.38) (+26 -26)
+		debian/copyright (1.6) (+6 -4)
+		debian/cupsys-driver-gimpprint.install (1.6) (+3 -3)
+		debian/cupsys-driver-gimpprint.postinst (1.5) (+2 -2)
+		debian/rules (1.50) (+5 -5)
+
+	Update Debian packaging for 5.0 alpha.
+	Change all references from 4.3 to 5.0.
+
+2004-02-08	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.57) (+151 -20)
+
+	874269	[Usability] Printer model list sorted incorrectly
+
 2004-02-07	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.89) (+4 -11)
+	Files:	include/gimp-print/printers.h (1.2) (+3 -2)
+		src/cups/genppd.c (1.89) (+4 -11)
 		src/foomatic/foomatic-generator.in (1.38) (+1 -20)
 		src/foomatic/printers.c (1.7) (+3 -1)
 		src/main/printers.c (1.61) (+10 -1)
@@ -4733,6 +6520,7 @@
 2004-01-21	<rleigh@sourceforge.net>
 
 	Files:	src/main/dither-main.c (1.39) (+2 -1)
+		src/main/dither.h (1.23) (+3 -3)
 
 	Include "dither.h" to correctly prototype all functions.
 	Rename stpi_dither_matrix_iterated_init() argument name "exp" to "exponent"
@@ -4740,6 +6528,13 @@
 
 2004-01-21	<rleigh@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.56) (+3 -3)
+
+	Use the correct signature for a GCallback.  The ToggleButton needs a
+	GtkWidget* and gpointer, and returns void.
+
+2004-01-21	<rleigh@sourceforge.net>
+
 	Files:	doc/users_guide/Makefile.am (1.38) (+12 -12)
 
 	Fix install error when using the provided install-sh.
@@ -4755,6 +6550,7 @@
 		po/fr.po (1.52) (+17 -17)
 		po/ja.po (1.26) (+17 -17)
 		po/nl.po (1.32) (+17 -17)
+		po/no.po (1.52) (+17 -17)
 		po/pl.po (1.36) (+17 -17)
 		po/pt.po (1.30) (+17 -17)
 		po/sk.po (1.35) (+17 -17)
@@ -4768,6 +6564,18 @@
 
 	Fix AC_LIBOBJ error with autoconf 2.58 and 2.59.
 
+2004-01-04	<rleigh@sourceforge.net>
+
+	Files:	debian/README.Debian (1.50) (+2 -3)
+		debian/changelog (1.59) (+8 -0)
+		debian/cupsys-driver-gimpprint.install (1.5) (+3 -3)
+		debian/cupsys-driver-gimpprint.postinst (1.4) (+2 -2)
+		debian/libgimpprint-dev.install (1.4) (+6 -6)
+		debian/libgimpprintui-dev.install (1.3) (+5 -5)
+		debian/rules (1.49) (+20 -3)
+
+	Fix Debian packaging for the CUPS versioned binaries change.
+
 2003-12-29	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.106) (+20 -14)
@@ -4820,6 +6628,7 @@
 2003-12-19	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.93) (+3 -3)
+		debian/README.Debian (1.49) (+3 -2)
 
 	Bump interface version and prep for 5.0 alpha
 
@@ -4931,6 +6740,12 @@
 
 	Update British English translation.
 
+2003-12-13	<rleigh@sourceforge.net>
+
+	Files:	man/gimpprint-resolutions.7.in (1.4) (+1 -2)
+
+	Small markup fix reported by Eric Raymond.
+
 2003-12-13	<rlk@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.140) (+2 -2)
@@ -5007,6 +6822,7 @@
 		po/fr.po (1.51) (+65 -71)
 		po/ja.po (1.25) (+65 -71)
 		po/nl.po (1.31) (+65 -71)
+		po/no.po (1.51) (+65 -71)
 		po/pl.po (1.35) (+65 -71)
 		po/pt.po (1.29) (+65 -71)
 		po/sk.po (1.34) (+65 -71)
@@ -5019,6 +6835,7 @@
 	Files:	NEWS (1.143) (+22 -3)
 		README (1.132) (+1 -1)
 		configure.ac (1.88) (+3 -3)
+		debian/README.Debian (1.48) (+1 -1)
 
 	Prep for 4.3.25
 
@@ -5036,8 +6853,18 @@
 
 2003-12-02	<rlk@sourceforge.net>
 
+	Files:	doc/developer/escp2.texi (1.4) (+18 -9)
+		doc/developer/weave.texi (1.3) (+22 -22)
+
+	A few more changes for renaming
+
+2003-12-02	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.142) (+1 -1)
+		doc/developer/escp2.texi (1.3) (+6 -6)
+		doc/developer/new-printer.texi (1.3) (+91 -70)
 		doc/users_guide/gimp.sgml (1.2) (+0 -12)
+		man/gimpprint-resolutions.7.in (1.3) (+117 -162)
 		po/cs.po (1.15) (+87 -272)
 		po/da.po (1.43) (+86 -80)
 		po/de.po (1.29) (+87 -265)
@@ -5047,10 +6874,12 @@
 		po/fr.po (1.50) (+87 -265)
 		po/ja.po (1.24) (+87 -265)
 		po/nl.po (1.30) (+87 -290)
+		po/no.po (1.50) (+86 -80)
 		po/pl.po (1.34) (+86 -177)
 		po/pt.po (1.28) (+87 -265)
 		po/sk.po (1.33) (+87 -283)
 		po/sv.po (1.59) (+88 -266)
+		src/ghost/README (1.92) (+19 -55)
 		src/main/escp2-driver.c (1.14) (+11 -9)
 		src/main/escp2-resolutions.c (1.22) (+32 -32)
 		src/main/print-escp2-data.c (1.149) (+25 -25)
@@ -5122,6 +6951,15 @@
 
 	Files:	Makefile.am (1.136) (+2 -2)
 		README (1.131) (+1 -1)
+		cups-gimpprint.list.in (1.2) (+3 -3)
+		debian/libgimpprint-doc.doc-base.in (1.2) (+2 -2)
+		doc/developer/copying.texi (1.2) (+7 -7)
+		doc/developer/gimpprint.texi (1.2) (+7 -7)
+		doc/developer/integrating.texi (1.4) (+6 -6)
+		doc/developer/introduction.texi (1.2) (+5 -5)
+		doc/developer/overview.texi (1.2) (+3 -3)
+		doc/developer/problems.texi (1.2) (+4 -4)
+		doc/developer/using.texi (1.2) (+1 -1)
 		doc/users_guide/cups.sgml (1.3) (+2 -2)
 		doc/users_guide/history.sgml (1.2) (+1 -1)
 		m4/stp.m4 (1.5) (+3 -3)
@@ -5134,6 +6972,8 @@
 		src/cups/cups-genppdupdate.in (1.10) (+2 -2)
 		src/cups/genppd.c (1.85) (+3 -2)
 		src/cups/rastertoprinter.c (1.78) (+4 -4)
+		src/foomatic/foomatic-templates-ijs/gimp-print.xml (1.4) (+8 -8)
+		src/main/gimpprint.dtd (1.5) (+2 -2)
 
 	Standardize on "Gimp-Print" capitalization throughout the package.
 
@@ -5174,6 +7014,7 @@
 		po/fr.po (1.49) (+773 -623)
 		po/ja.po (1.23) (+773 -623)
 		po/nl.po (1.29) (+771 -623)
+		po/no.po (1.49) (+771 -623)
 		po/pl.po (1.33) (+771 -621)
 		po/pt.po (1.27) (+773 -623)
 		po/sk.po (1.32) (+773 -623)
@@ -5202,6 +7043,7 @@
 2003-11-22	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.139) (+34 -24)
+		debian/README.Debian (1.47) (+1 -1)
 
 	Prep for Gimp-Print 4.3.24
 
@@ -5253,8 +7095,19 @@
 2003-11-20	<rleigh@sourceforge.net>
 
 	Files:	include/Makefile.am (1.4) (+2 -2)
+		include/gimp-print-ui/Makefile.am (1.1) (added)
+		include/gimp-print-ui/gimp-print-ui.h (1.1) (added)
+		include/gimp-print/Makefile.am (1.14) (+1 -2)
+		include/gimp-print/gimp-print-ui.h (1.4) (removed)
+		src/gimp/instead_of_gimp_main.c (1.5) (+1 -1)
 		src/gimp/print.c (1.56) (+2 -2)
 		src/gimp/print_gimp.h (1.42) (+2 -2)
+		src/libgimpprintui/panel.c (1.55) (+2 -2)
+		src/libgimpprintui/plist.c (1.30) (+3 -3)
+		src/libgimpprintui/print-image-thumbnail.c (1.4) (+3 -3)
+		src/libgimpprintui/printrcl.l (1.6) (+2 -2)
+		src/libgimpprintui/printrcy.y (1.8) (+2 -2)
+		src/libgimpprintui/ui-utils.c (1.7) (+2 -2)
 
 	Move include/gimp-print/gimp-print-ui.h to include/gimp-print-ui/gimp-print-ui.h
 	gimp-print-ui.h is installed into $includedir/gimp-print-ui, keeping the
@@ -5310,6 +7163,12 @@
 
 2003-11-16	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.54) (+5 -3)
+
+	Don't blindly assume that PageSize is the only parameter of class PAGE_SIZE.
+
+2003-11-16	<rlk@sourceforge.net>
+
 	Files:	src/main/print-papers.c (1.29) (+10 -7)
 
 	Eliminate a memory leak and unsafe free.
@@ -5361,6 +7220,7 @@
 	Files:	src/main/dither-eventone.c (1.32) (+46 -33)
 		src/main/dither-impl.h (1.19) (+3 -2)
 		src/main/dither-inks.c (1.20) (+14 -10)
+		src/main/dither.h (1.22) (+6 -5)
 		src/main/print-canon.c (1.139) (+8 -2)
 		src/main/print-escp2-data.c (1.142) (+8 -8)
 		src/main/print-escp2.c (1.299) (+7 -2)
@@ -5421,6 +7281,7 @@
 2003-11-09	<rlk@sourceforge.net>
 
 	Files:	README (1.130) (+9 -9)
+		include/gimp-print/vars.h (1.3) (+4 -3)
 		src/cups/Makefile.am (1.69) (+4 -4)
 		src/cups/genppd.c (1.84) (+3 -3)
 		src/main/dither-eventone.c (1.25) (+8 -3)
@@ -5476,6 +7337,7 @@
 		src/main/dither-main.c (1.33) (+7 -5)
 		src/main/dither-ordered.c (1.14) (+18 -12)
 		src/main/dither-very-fast.c (1.12) (+18 -12)
+		src/main/dither.h (1.21) (+5 -4)
 		src/main/print-canon.c (1.137) (+2 -2)
 		src/main/print-escp2.c (1.297) (+2 -2)
 		src/main/print-lexmark.c (1.135) (+2 -2)
@@ -5531,6 +7393,7 @@
 		po/fr.po (1.48) (+64 -35)
 		po/ja.po (1.22) (+64 -35)
 		po/nl.po (1.28) (+64 -35)
+		po/no.po (1.48) (+64 -35)
 		po/pl.po (1.32) (+64 -35)
 		po/pt.po (1.26) (+64 -35)
 		po/sk.po (1.31) (+64 -35)
@@ -5542,6 +7405,7 @@
 
 	Files:	NEWS (1.134) (+12 -1)
 		README (1.129) (+1 -1)
+		debian/README.Debian (1.46) (+1 -1)
 
 	Bump version, prep for release
 
@@ -5574,6 +7438,7 @@
 
 	Files:	src/main/print-escp2.c (1.295) (+41 -2)
 		src/main/print-weave.c (1.55) (+5 -5)
+		src/main/weave.h (1.10) (+4 -4)
 		test/escp2-weavetest.c (1.30) (+7 -4)
 		test/run-weavetest (1.19) (+3 -3)
 
@@ -5602,6 +7467,7 @@
 		po/fr.po (1.47) (+524 -482)
 		po/ja.po (1.21) (+524 -482)
 		po/nl.po (1.27) (+524 -483)
+		po/no.po (1.47) (+523 -479)
 		po/pl.po (1.31) (+518 -477)
 		po/pt.po (1.25) (+524 -482)
 		po/sk.po (1.30) (+524 -482)
@@ -5771,6 +7637,7 @@
 
 	Files:	man/.cvsignore (1.7) (+0 -1)
 		man/Makefile.am (1.19) (+1 -2)
+		man/gimpprint-config.1.in (1.7) (removed)
 
 	Remove references to nonexistent gimpprint-config
 
@@ -5780,6 +7647,13 @@
 
 	Use the correct color functions for 8-bit RGB.
 
+2003-10-26	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.53) (+7 -7)
+
+	Align the horizontal center button with the horizontal positioning
+	entries, and likewise the vertical.  Suggested by Stephen Gildea.
+
 2003-10-25	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.294) (+2 -2)
@@ -5803,6 +7677,19 @@
 
 	Improve plain paper on EX.
 
+2003-10-24	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.52) (+1 -5)
+
+	Remove spurious debugging printfs
+
+2003-10-21	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.51) (+22 -9)
+
+	Hold down control key with middle mouse button to move image along a
+	fixed grid.
+
 2003-10-20	<rlk@sourceforge.net>
 
 	Files:	src/main/print-dither-matrices.c (1.29) (+3 -3)
@@ -5821,6 +7708,7 @@
 		src/main/print-papers.c (1.28) (+7 -3)
 		src/main/printers.c (1.60) (+2 -1)
 		src/main/xml.c (1.26) (+57 -18)
+		src/main/xml.h (1.9) (+6 -2)
 
 	Don't autoload XML files.  Instead, allow components to register
 	XML files for loading, or load them explicitly when needed.
@@ -6042,6 +7930,7 @@
 2003-10-13	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.76) (+5 -3)
+		include/gimp-print/image.h (1.2) (+4 -2)
 		src/main/.cvsignore (1.19) (+0 -1)
 		src/main/channel.c (1.8) (+2 -2)
 		src/testpattern/extended.sample (1.6) (+34 -34)
@@ -6063,7 +7952,9 @@
 
 2003-10-11	<rlk@sourceforge.net>
 
-	Files:	src/main/print-vars.c (1.59) (+5 -3)
+	Files:	src/ghost/ijsgimpprint.c (1.44) (+5 -3)
+		src/libgimpprintui/panel.c (1.50) (+3 -2)
+		src/main/print-vars.c (1.59) (+5 -3)
 
 	Make sure we don't free a null curve.
 
@@ -6082,6 +7973,12 @@
 
 2003-10-10	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.49) (+2 -1)
+
+	Don't keep a stale pv pointer around.
+
+2003-10-10	<rlk@sourceforge.net>
+
 	Files:	src/main/dither-main.c (1.28) (+3 -1)
 
 	Fix valgrind problem: don't try to set anything when describing a
@@ -6178,6 +8075,26 @@
 
 2003-10-01	<rleigh@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.8) (+5 -5)
+		debian/changelog (1.58) (+11 -0)
+		debian/control.in (1.37) (+28 -25)
+		debian/gimp-print.docs (1.1) (added)
+		debian/gimp-print.install (1.1) (added)
+		debian/gimp-print.postrm (1.1) (added)
+		debian/gimp-print.preinst (1.1) (added)
+		debian/gimp1.2-print.docs (1.6) (removed)
+		debian/gimp1.2-print.install (1.3) (removed)
+		debian/gimp1.2-print.postrm (1.5) (removed)
+		debian/gimp1.2-print.preinst (1.5) (removed)
+		debian/libgimpprintui-dev.install (1.2) (+2 -2)
+		debian/rules (1.48) (+3 -3)
+
+	Update package descriptions from Debian unstable.
+	Update package dependencies.
+	Rename gimp1.2-print to gimp-print in line with gimp1.2 -> gimp package changes.
+
+2003-10-01	<rleigh@sourceforge.net>
+
 	Files:	src/testpattern/testpattern.h (1.8) (+3 -1)
 
 	Fix YYSTYPE compatibility problem between different versions of GNU flex.
@@ -6274,6 +8191,12 @@
 
 	Fix a point error in the 2200 in the yellow-green.
 
+2003-09-27	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.48) (+8 -6)
+
+	Fix thumbnail display of landscape and seascape mode.
+
 2003-09-26	<m0m@sourceforge.net>
 
 	Files:	src/main/print-olympus.c (1.28) (+66 -39)
@@ -6349,6 +8272,7 @@
 		po/fr.po (1.46) (+244 -215)
 		po/ja.po (1.20) (+244 -215)
 		po/nl.po (1.26) (+244 -215)
+		po/no.po (1.46) (+244 -215)
 		po/pl.po (1.30) (+244 -215)
 		po/pt.po (1.24) (+244 -215)
 		po/sk.po (1.29) (+244 -215)
@@ -6508,6 +8432,7 @@
 	Files:	NEWS (1.125) (+107 -5)
 		README (1.128) (+9 -9)
 		configure.ac (1.74) (+3 -3)
+		debian/README.Debian (1.45) (+1 -1)
 
 	Bump version
 
@@ -6582,6 +8507,7 @@
 2003-09-18	<rlk@sourceforge.net>
 
 	Files:	src/main/channel.c (1.7) (+56 -14)
+		src/main/color.h (1.14) (+2 -2)
 		src/main/escp2-channels.c (1.24) (+4 -4)
 		src/main/escp2-inks.c (1.22) (+2 -2)
 		src/main/escp2-papers.c (1.18) (+218 -113)
@@ -6720,6 +8646,7 @@
 		po/fr.po (1.45) (+124 -119)
 		po/ja.po (1.19) (+124 -119)
 		po/nl.po (1.25) (+124 -119)
+		po/no.po (1.45) (+123 -119)
 		po/pl.po (1.29) (+123 -119)
 		po/pt.po (1.23) (+124 -119)
 		po/sk.po (1.28) (+124 -119)
@@ -6744,6 +8671,7 @@
 	Files:	NEWS (1.121) (+56 -3)
 		README (1.127) (+9 -9)
 		configure.ac (1.73) (+3 -3)
+		debian/README.Debian (1.44) (+1 -1)
 
 	Bump version
 
@@ -6832,6 +8760,12 @@
 
 2003-08-30	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.47) (+15 -15)
+
+	Bump copyright notices
+
+2003-08-30	<rlk@sourceforge.net>
+
 	Files:	src/main/print-olympus.c (1.19) (+3 -3)
 
 	Fix const warnings
@@ -6853,6 +8787,7 @@
 2003-08-25	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.119) (+5 -3)
+		man/gimpprint-models.7.in (1.3) (+3 -1)
 		src/main/printers.xml (1.77) (+5 -1)
 
 	support for OLYMPUS P400
@@ -6872,13 +8807,33 @@
 	printed by grep when there are no PPD files to process.
 	Use @PERL@ rather than hardcoding the path to the interpreter.
 
+2003-08-24	<rleigh@sourceforge.net>
+
+	Files:	man/ijsgimpprint.1.in (1.6) (+12 -10)
+
+	Fold examples to display correctly on 80 col terminals and printers.
+
 2003-08-22	<rleigh@sourceforge.net>
 
-	Files:	man/cups-calibrate.8.in (1.6) (+5 -5)
+	Files:	debian/control.in (1.36) (+11 -6)
+		debian/rules (1.47) (+4 -27)
+		man/cups-calibrate.8.in (1.6) (+5 -5)
 		man/cups-genppd.8.in (1.3) (+19 -19)
 		man/cups-genppdconfig.8.in (1.4) (+9 -9)
 		man/cups-genppdupdate.8.in (1.2) (+12 -12)
 		man/escputil.1.in (1.10) (+10 -10)
+		man/gimpprint-color.7.in (1.2) (+11 -11)
+		man/gimpprint-config.1.in (1.6) (+16 -16)
+		man/gimpprint-dithers.7.in (1.2) (+11 -11)
+		man/gimpprint-imagetypes.7.in (1.3) (+11 -11)
+		man/gimpprint-inktypes.7.in (1.2) (+11 -11)
+		man/gimpprint-mediasizes.7.in (1.2) (+13 -13)
+		man/gimpprint-mediasources.7.in (1.2) (+11 -11)
+		man/gimpprint-mediatypes.7.in (1.2) (+11 -11)
+		man/gimpprint-models.7.in (1.2) (+192 -192)
+		man/gimpprint-resolutions.7.in (1.2) (+11 -11)
+		man/gimpprint.3.in (1.6) (+13 -13)
+		man/ijsgimpprint.1.in (1.5) (+38 -38)
 
 	Update all manual pages to correctly distinguish between hyphens and
 	en-dashes/minus signs.  This is required to allow copy/paste in a
@@ -6951,6 +8906,7 @@
 		po/fr.po (1.44) (+954 -950)
 		po/ja.po (1.18) (+932 -933)
 		po/nl.po (1.24) (+869 -918)
+		po/no.po (1.44) (+861 -913)
 		po/pl.po (1.28) (+852 -909)
 		po/pt.po (1.22) (+937 -937)
 		po/sk.po (1.27) (+955 -955)
@@ -6963,6 +8919,7 @@
 	Files:	NEWS (1.118) (+62 -1)
 		README (1.126) (+13 -9)
 		configure.ac (1.72) (+3 -3)
+		debian/README.Debian (1.43) (+1 -1)
 
 	Increment version
 
@@ -7136,6 +9093,7 @@
 		src/main/mxml-file.c (1.4) (+625 -205)
 		src/main/mxml-node.c (1.4) (+3 -2)
 		src/main/mxml-search.c (1.4) (+3 -2)
+		src/main/mxml.h (1.4) (+9 -2)
 		src/main/xml.c (1.25) (+3 -3)
 
 	Update to mxml 1.1.1 plus a few bug fixes.
@@ -7200,8 +9158,8 @@
 		src/main/Makefile.am (1.79) (+47 -42)
 		src/main/dither-main.c (1.25) (+85 -18)
 		src/main/escp2-resolutions.c (1.17) (+1 -5)
-		src/main/generic-options.c (1.1) ( )
-		src/main/generic-options.h (1.1) ( )
+		src/main/generic-options.c (1.1) (added)
+		src/main/generic-options.h (1.1) (added)
 		src/main/print-color.c (1.87) (+65 -37)
 		src/main/print-escp2.c (1.279) (+4 -4)
 		src/main/print-vars.c (1.57) (+18 -6)
@@ -7223,8 +9181,30 @@
 
 2003-07-18	<rlk@sourceforge.net>
 
+	Files:	src/foomatic/foomatic-templates-ijs/Brightness.xml (1.5) (removed)
+		src/foomatic/foomatic-templates-ijs/Contrast.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Cyan.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Density.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/DitherAlgorithm.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Gamma.xml (1.5) (removed)
+		src/foomatic/foomatic-templates-ijs/ImageOptimization.xml (1.2) (removed)
+		src/foomatic/foomatic-templates-ijs/InkType.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/InputSlot.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Magenta.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/MediaType.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Quality.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Saturation.xml (1.5) (removed)
+		src/foomatic/foomatic-templates-ijs/Yellow.xml (1.4) (removed)
+
+	Remove template files for options that don't require special
+	processing.  These need to be generated on the fly.
+
+2003-07-18	<rlk@sourceforge.net>
+
 	Files:	src/cups/Makefile.am (1.66) (+3 -3)
 		src/cups/genppd.c (1.78) (+2 -5)
+		src/cups/gimp-print-cups.c (1.6) (removed)
+		src/cups/gimp-print-cups.h (1.3) (removed)
 		src/cups/rastertoprinter.c (1.68) (+2 -3)
 		src/main/print-color.c (1.86) (+5 -5)
 		src/main/printers.c (1.59) (+5 -5)
@@ -7298,7 +9278,9 @@
 	Files:	src/cups/cups-genppdupdate.in (1.4) (+22 -6)
 		src/cups/genppd.c (1.74) (+144 -14)
 		src/cups/rastertoprinter.c (1.65) (+5 -5)
+		src/libgimpprintui/panel.c (1.46) (+8 -2)
 		src/main/channel.c (1.6) (+64 -5)
+		src/main/color.h (1.13) (+2 -1)
 		src/main/escp2-channels.c (1.12) (+34 -25)
 		src/main/escp2-driver.c (1.9) (+4 -1)
 		src/main/print-color.c (1.85) (+14 -1)
@@ -7330,6 +9312,12 @@
 
 2003-07-12	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/plist.c (1.29) (+10 -9)
+
+	Use stderr rather than stdout for error/debug messages
+
+2003-07-12	<rlk@sourceforge.net>
+
 	Files:	src/main/xml.c (1.24) (+4 -4)
 
 	Use stpi_erprintf rather than explicit stderr
@@ -7340,6 +9328,12 @@
 
 	Use stpi_erprintf rather that stderr.
 
+2003-07-12	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/vars.h (1.2) (+3 -3)
+
+	Type constness fix (previous change lost when the headers were split).
+
 2003-07-07	<rleigh@sourceforge.net>
 
 	Files:	src/cups/cups-genppdupdate.in (1.3) (+3 -3)
@@ -7357,6 +9351,7 @@
 		po/fr.po (1.43) (+117 -107)
 		po/ja.po (1.17) (+117 -107)
 		po/nl.po (1.23) (+117 -107)
+		po/no.po (1.43) (+117 -107)
 		po/pl.po (1.27) (+117 -107)
 		po/pt.po (1.21) (+117 -107)
 		po/sk.po (1.26) (+117 -107)
@@ -7369,6 +9364,7 @@
 	Files:	NEWS (1.116) (+18 -1)
 		README (1.125) (+1 -1)
 		configure.ac (1.71) (+3 -3)
+		debian/README.Debian (1.42) (+1 -1)
 
 	Prep for 4.3.18
 
@@ -7388,16 +9384,55 @@
 
 2003-06-29	<rleigh@sourceforge.net>
 
+	Files:	include/gimp-print/Makefile.am (1.13) (+9 -2)
+		include/gimp-print/paper.h (1.1) (added)
+
+	Add paper.h (split out from gimp-print.h)
+
+2003-06-29	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.57) (+7 -0)
+		debian/control.in (1.35) (+1 -1)
+
+	Sync Debian package dependencies with Debian unstable
+
+2003-06-29	<rleigh@sourceforge.net>
+
 	Files:	po/en_GB.po (1.106) (+34 -58)
 
 	Update British English translation
 
 2003-06-29	<rleigh@sourceforge.net>
 
+	Files:	include/gimp-print/array.h (1.4) (+4 -4)
+		include/gimp-print/curve.h (1.5) (+9 -5)
+		include/gimp-print/gimp-print-intl-internal.h (1.2) (+10 -1)
+		include/gimp-print/gimp-print-intl.h (1.3) (+10 -1)
+		include/gimp-print/gimp-print-ui.h (1.3) (+11 -5)
+		include/gimp-print/gimp-print-version.h.in (1.2) (+22 -1)
+		include/gimp-print/gimp-print.h (1.38) (+13 -786)
+		include/gimp-print/image.h (1.1) (added)
+		include/gimp-print/printers.h (1.1) (added)
+		include/gimp-print/sequence.h (1.3) (+5 -4)
+		include/gimp-print/string-list.h (1.1) (added)
+		include/gimp-print/util.h (1.1) (added)
+		include/gimp-print/vars.h (1.1) (added)
+
+	Split gimp-print.h into separate headers.
+	This is in order to make documentation simpler.
+
+2003-06-29	<rleigh@sourceforge.net>
+
 	Files:	README (1.124) (+10 -11)
 
 	Document gettext changes (libintl is no longer included)
 
+2003-06-29	<rleigh@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrc.h (1.4) (+5 -1)
+
+	Fix compiling when using bison 1.875
+
 2003-06-24	<rleigh@sourceforge.net>
 
 	Files:	scripts/global.mk (1.5) (+1 -1)
@@ -7425,6 +9460,7 @@
 		po/fr.po (1.42) (+466 -376)
 		po/ja.po (1.16) (+466 -376)
 		po/nl.po (1.22) (+463 -375)
+		po/no.po (1.42) (+465 -373)
 		po/pl.po (1.26) (+465 -373)
 		po/pt.po (1.20) (+466 -376)
 		po/sk.po (1.25) (+466 -376)
@@ -7437,6 +9473,7 @@
 	Files:	NEWS (1.114) (+1 -1)
 		README (1.123) (+1 -1)
 		configure.ac (1.70) (+3 -3)
+		debian/README.Debian (1.41) (+1 -1)
 
 	Prep for 4.3.17
 
@@ -7481,7 +9518,8 @@
 
 2003-06-20	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.70) (+16 -4)
+	Files:	include/gimp-print/gimp-print.h (1.37) (+3 -2)
+		src/cups/genppd.c (1.70) (+16 -4)
 		src/cups/rastertoprinter.c (1.63) (+76 -45)
 		src/main/dither-main.c (1.23) (+3 -3)
 		src/main/print-canon.c (1.126) (+13 -13)
@@ -7506,6 +9544,7 @@
 		src/main/mxml-file.c (1.3) (+17 -17)
 		src/main/mxml-node.c (1.3) (+35 -35)
 		src/main/mxml-search.c (1.3) (+14 -14)
+		src/main/mxml.h (1.3) (+18 -18)
 		src/main/print-dither-matrices.c (1.25) (+9 -9)
 		src/main/print-papers.c (1.27) (+12 -12)
 		src/main/printers.c (1.57) (+8 -8)
@@ -7529,11 +9568,13 @@
 		src/main/mxml-file.c (1.2) (+1016 -0)
 		src/main/mxml-node.c (1.2) (+493 -0)
 		src/main/mxml-search.c (1.2) (+198 -0)
+		src/main/mxml.h (1.2) (+166 -0)
 		src/main/print-dither-matrices.c (1.24) (+34 -41)
 		src/main/print-papers.c (1.26) (+83 -88)
 		src/main/printers.c (1.56) (+67 -62)
 		src/main/sequence.c (1.8) (+35 -102)
 		src/main/xml.c (1.22) (+67 -85)
+		src/main/xml.h (1.8) (+12 -17)
 		src/testpattern/Makefile.am (1.17) (+2 -2)
 		test/xml-curve.c (1.3) (+28 -4)
 
@@ -7541,25 +9582,31 @@
 
 2003-06-19	<rlk@sourceforge.net>
 
-	Files:	src/main/mxml-search.c (1.1) ( )
+	Files:	src/main/mxml.h (1.1) (added)
+
+	file mxml.h was initially added on branch mxml-branch.
+
+2003-06-19	<rlk@sourceforge.net>
+
+	Files:	src/main/mxml-search.c (1.1) (added)
 
 	file mxml-search.c was initially added on branch mxml-branch.
 
 2003-06-19	<rlk@sourceforge.net>
 
-	Files:	src/main/mxml-node.c (1.1) ( )
+	Files:	src/main/mxml-node.c (1.1) (added)
 
 	file mxml-node.c was initially added on branch mxml-branch.
 
 2003-06-19	<rlk@sourceforge.net>
 
-	Files:	src/main/mxml-file.c (1.1) ( )
+	Files:	src/main/mxml-file.c (1.1) (added)
 
 	file mxml-file.c was initially added on branch mxml-branch.
 
 2003-06-19	<rlk@sourceforge.net>
 
-	Files:	src/main/mxml-attr.c (1.1) ( )
+	Files:	src/main/mxml-attr.c (1.1) (added)
 
 	file mxml-attr.c was initially added on branch mxml-branch.
 
@@ -7581,9 +9628,16 @@
 
 	Protect against bad values that may result in null pointers internally.
 
+2003-06-17	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.45) (+5 -1)
+
+	Avoid recursion problems in autosize
+
 2003-06-15	<rlk@sourceforge.net>
 
 	Files:	src/main/xml.c (1.21) (+12 -3)
+		src/main/xml.h (1.7) (+2 -13)
 
 	Move a few things out of libxml.h
 
@@ -7632,6 +9686,16 @@
 
 2003-06-14	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/gimp-print-ui.h (1.2) (+2 -1)
+		src/libgimpprintui/panel.c (1.44) (+107 -14)
+		src/libgimpprintui/plist.c (1.28) (+5 -2)
+		src/libgimpprintui/printrcl.l (1.5) (+2 -1)
+		src/libgimpprintui/printrcy.y (1.7) (+9 -3)
+
+	Auto-sizing option for roll feed paper
+
+2003-06-14	<rlk@sourceforge.net>
+
 	Files:	src/main/escp2-driver.c (1.7) (+13 -1)
 		src/main/print-escp2-data.c (1.114) (+4 -4)
 		src/main/print-escp2.c (1.271) (+4 -6)
@@ -7686,15 +9750,29 @@
 
 	Remove unused and unmaintained timing code
 
+2003-06-13	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.91) (+2 -1)
+
+	Minor change
+
+2003-06-13	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.43) (+26 -14)
+
+	Make sure to always build page size combo correctly.
+
 2003-06-12	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.68) (+9 -7)
+		src/libgimpprintui/Makefile.am (1.6) (+3 -1)
 
 	Conditionally build libgimpprintui correctly.
 
 2003-06-11	<rlk@sourceforge.net>
 
-	Files:	src/main/escp2-resolutions.c (1.16) (+31 -2)
+	Files:	src/ghost/README (1.90) (+112 -86)
+		src/main/escp2-resolutions.c (1.16) (+31 -2)
 		src/main/print-escp2-data.c (1.113) (+12 -12)
 		src/main/print-escp2.h (1.54) (+4 -3)
 
@@ -7725,9 +9803,22 @@
 
 2003-06-08	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.89) (+31 -0)
+
+	Start updating this
+
+2003-06-08	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.88) (+22 -63)
+
+	Start cleaning up the resolution list
+
+2003-06-08	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.110) (+1 -2)
 		configure.ac (1.67) (+3 -7)
 		src/ghost/Makefile.am (1.32) (+3 -3)
+		src/ghost/ijsgimpprint.c (1.43) (+29 -50)
 
 	Remove use of glib from IJS driver
 
@@ -7766,6 +9857,7 @@
 		po/fr.po (1.41) (+261 -243)
 		po/ja.po (1.15) (+261 -243)
 		po/nl.po (1.21) (+261 -243)
+		po/no.po (1.41) (+261 -243)
 		po/pl.po (1.25) (+261 -246)
 		po/pt.po (1.19) (+261 -243)
 		po/sk.po (1.24) (+261 -243)
@@ -7775,8 +9867,15 @@
 
 2003-06-08	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/Makefile.am (1.12) (+3 -2)
+
+	Add color.h.
+
+2003-06-08	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.109) (+35 -11)
 		README (1.122) (+1 -1)
+		debian/README.Debian (1.40) (+1 -1)
 
 	Prep for Gimp-Print 4.3.16
 
@@ -7791,6 +9890,12 @@
 
 2003-06-07	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.42) (+4 -2)
+
+	Don't change the activity status of a value.
+
+2003-06-07	<rlk@sourceforge.net>
+
 	Files:	src/main/printers.c (1.55) (+6 -1)
 
 	Don't attempt to check a parameter that is inactive.
@@ -7816,6 +9921,12 @@
 
 	Associate shades with ink sets, rather than with dot sizes.
 
+2003-06-07	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.41) (+20 -4)
+
+	Enable/disable options based on combo settings
+
 2003-06-06	<rlk@sourceforge.net>
 
 	Files:	src/main/dither-inks.c (1.14) (+9 -8)
@@ -7866,9 +9977,16 @@
 	There should be no need for stdint.h.  If something should break, this
 	should probably include sys/types.h.
 
+2003-06-05	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/gimp-print-ui-internal.h (1.12) (+2 -1)
+
+	Need sys/types.h for off_t.
+
 2003-06-04	<rlk@sourceforge.net>
 
 	Files:	src/main/channel.c (1.5) (+23 -6)
+		src/main/color.h (1.12) (+4 -1)
 
 	Do not take density into account for doing channel splitting
 
@@ -7922,9 +10040,13 @@
 
 2003-06-03	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.75) (+40 -26)
-		src/main/color.c (1.1) ( )
+	Files:	include/gimp-print/color.h (1.1) (added)
+		include/gimp-print/gimp-print.h (1.36) (+10 -2)
+		src/main/Makefile.am (1.75) (+40 -26)
+		src/main/color.c (1.1) (added)
+		src/main/color.h (1.11) (+37 -1)
 		src/main/module.c (1.16) (+8 -2)
+		src/main/module.h (1.4) (+3 -2)
 		src/main/print-canon.c (1.124) (+13 -13)
 		src/main/print-color.c (1.80) (+68 -12)
 		src/main/print-escp2.c (1.265) (+13 -13)
@@ -8010,6 +10132,7 @@
 		po/fr.po (1.40) (+357 -311)
 		po/ja.po (1.14) (+357 -311)
 		po/nl.po (1.20) (+357 -311)
+		po/no.po (1.40) (+353 -307)
 		po/pl.po (1.24) (+344 -303)
 		po/pt.po (1.18) (+357 -311)
 		po/sk.po (1.23) (+357 -311)
@@ -8136,6 +10259,7 @@
 	Files:	NEWS (1.105) (+32 -1)
 		README (1.120) (+1 -1)
 		configure.ac (1.64) (+3 -3)
+		debian/README.Debian (1.39) (+1 -1)
 
 	Prep for Gimp-Print 4.3.15
 
@@ -8158,6 +10282,7 @@
 
 	Files:	src/main/Makefile.am (1.74) (+1 -2)
 		src/main/dither-ed.c (1.11) (+77 -66)
+		src/main/dither-fast.c (1.10) (removed)
 		src/main/dither-impl.h (1.9) (+2 -3)
 		src/main/dither-inks.c (1.11) (+5 -5)
 		src/main/dither-inlined-functions.h (1.4) (+1 -16)
@@ -8176,7 +10301,9 @@
 
 2003-05-29	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.73) (+4 -4)
+	Files:	debian/README.building (1.5) (+4 -4)
+		debian/control.in (1.34) (+1 -1)
+		src/main/Makefile.am (1.73) (+4 -4)
 
 	Update Debian packaging and fix "make dist".
 
@@ -8189,12 +10316,15 @@
 2003-05-29	<rlk@sourceforge.net>
 
 	Files:	src/main/channel.c (1.3) (+119 -32)
+		src/main/color.h (1.10) (+7 -3)
 		src/main/dither-ed.c (1.10) (+3 -11)
 		src/main/dither-eventone.c (1.13) (+15 -80)
+		src/main/dither-fast.c (1.9) (+1 -3)
 		src/main/dither-impl.h (1.8) (+2 -5)
 		src/main/dither-inks.c (1.10) (+4 -29)
 		src/main/dither-ordered.c (1.9) (+1 -3)
 		src/main/dither-very-fast.c (1.7) (+2 -4)
+		src/main/dither.h (1.20) (+2 -5)
 		src/main/print-canon.c (1.123) (+6 -6)
 		src/main/print-escp2.c (1.262) (+2 -2)
 		src/main/print-lexmark.c (1.123) (+16 -16)
@@ -8207,10 +10337,12 @@
 
 2003-05-28	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.55) (+5 -7)
+	Files:	include/gimp-print/gimp-print.h (1.35) (+3 -3)
+		src/gimp/print.c (1.55) (+5 -7)
 		src/main/dither-ed.c (1.9) (+4 -2)
 		src/main/dither-impl.h (1.7) (+14 -14)
 		src/main/dither-inks.c (1.9) (+35 -5)
+		src/main/dither.h (1.19) (+10 -4)
 		src/main/escp2-channels.c (1.5) (+4 -4)
 		src/main/escp2-driver.c (1.6) (+2 -5)
 		src/main/escp2-inks.c (1.7) (+288 -1305)
@@ -8224,6 +10356,7 @@
 		src/main/print-pcl.c (1.106) (+5 -5)
 		src/main/print-vars.c (1.49) (+7 -6)
 		src/main/printers.c (1.52) (+2 -2)
+		src/main/printers.h (1.12) (+4 -4)
 		src/main/sequence.c (1.7) (+6 -8)
 		test/testdither.c (1.35) (+20 -20)
 
@@ -8237,14 +10370,17 @@
 
 	Files:	src/main/Makefile.am (1.72) (+2 -1)
 		src/main/channel.c (1.2) (+317 -0)
+		src/main/color.h (1.9) (+21 -5)
 		src/main/dither-ed.c (1.8) (+33 -110)
 		src/main/dither-eventone.c (1.12) (+43 -170)
+		src/main/dither-fast.c (1.8) (+19 -85)
 		src/main/dither-impl.h (1.6) (+20 -32)
 		src/main/dither-inks.c (1.8) (+352 -262)
 		src/main/dither-inlined-functions.h (1.3) (+5 -5)
 		src/main/dither-main.c (1.18) (+43 -174)
 		src/main/dither-ordered.c (1.8) (+19 -87)
 		src/main/dither-very-fast.c (1.6) (+22 -87)
+		src/main/dither.h (1.18) (+18 -45)
 		src/main/escp2-channels.c (1.4) (+35 -112)
 		src/main/escp2-inks.c (1.6) (+330 -1081)
 		src/main/print-canon.c (1.121) (+157 -107)
@@ -8322,6 +10458,12 @@
 
 	Clean up the arguments, provide usage string
 
+2003-05-25	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.40) (+9 -1)
+
+	Note order dependency on module loading for future fix.
+
 2003-05-23	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.4) (+25 -66)
@@ -8333,6 +10475,7 @@
 		po/fr.po (1.39) (+25 -66)
 		po/ja.po (1.13) (+25 -66)
 		po/nl.po (1.19) (+25 -66)
+		po/no.po (1.39) (+25 -66)
 		po/pl.po (1.23) (+25 -66)
 		po/pt.po (1.17) (+25 -66)
 		po/sk.po (1.22) (+25 -66)
@@ -8360,7 +10503,7 @@
 
 2003-05-21	<m0m@sourceforge.net>
 
-	Files:	src/main/print-olympus.c (1.1) ( )
+	Files:	src/main/print-olympus.c (1.1) (added)
 
 	file print-olympus.c was initially added on branch olympus-driver-branch.
 
@@ -8381,6 +10524,7 @@
 		src/foomatic/Makefile.am (1.38) (+2 -2)
 		src/ghost/Makefile.am (1.31) (+2 -2)
 		src/gimp/Makefile.am (1.32) (+2 -2)
+		src/libgimpprintui/Makefile.am (1.5) (+2 -2)
 		src/main/Makefile.am (1.70) (+2 -3)
 		src/testpattern/Makefile.am (1.16) (+2 -2)
 		test/Makefile.am (1.40) (+2 -2)
@@ -8389,7 +10533,7 @@
 
 2003-05-15	<rlk@sourceforge.net>
 
-	Files:	src/main/channel.c (1.1) ( )
+	Files:	src/main/channel.c (1.1) (added)
 
 	file channel.c was initially added on branch channel-20030511-branch.
 
@@ -8410,6 +10554,7 @@
 		po/fr.po (1.38) (+462 -450)
 		po/ja.po (1.12) (+462 -450)
 		po/nl.po (1.18) (+462 -450)
+		po/no.po (1.38) (+462 -450)
 		po/pl.po (1.22) (+462 -450)
 		po/pt.po (1.16) (+462 -450)
 		po/sk.po (1.21) (+462 -450)
@@ -8450,8 +10595,12 @@
 
 2003-05-10	<rlk@sourceforge.net>
 
-	Files:	src/main/printers.c (1.51) (+1 -2)
+	Files:	src/main/color.h (1.8) (+1 -5)
+		src/main/gimp-print-internal.h (1.70) (+7 -2)
+		src/main/printers.c (1.51) (+1 -2)
+		src/main/printers.h (1.11) (+2 -10)
 		src/main/util.h (1.24) (+2 -6)
+		src/main/xml.h (1.6) (+2 -3)
 
 	Clean up of header files
 
@@ -8469,7 +10618,14 @@
 
 2003-05-10	<rlk@sourceforge.net>
 
+	Files:	src/main/dither-fast.c (1.7) (+3 -2)
+
+	Some improvement
+
+2003-05-10	<rlk@sourceforge.net>
+
 	Files:	src/main/dither-ed.c (1.7) (+3 -3)
+		src/main/dither-fast.c (1.6) (+2 -2)
 		src/main/dither-ordered.c (1.7) (+2 -2)
 		src/main/dither-very-fast.c (1.5) (+1 -3)
 
@@ -8478,6 +10634,7 @@
 2003-05-10	<rlk@sourceforge.net>
 
 	Files:	src/main/dither-ed.c (1.6) (+2 -2)
+		src/main/dither-fast.c (1.5) (+2 -3)
 		src/main/dither-ordered.c (1.6) (+2 -2)
 
 	Fix light-dark transition in ED, fast, and ordered dither
@@ -8529,6 +10686,14 @@
 
 2003-05-08	<rleigh@sourceforge.net>
 
+	Files:	debian/changelog (1.56) (+9 -2)
+		debian/control.in (1.33) (+2 -2)
+
+	Update for 4.3.14.
+	Move development packages to section "libdevel".
+
+2003-05-08	<rleigh@sourceforge.net>
+
 	Files:	src/main/Makefile.am (1.69) (+3 -2)
 
 	Create xmli18n.h during "make dist".
@@ -8537,6 +10702,7 @@
 
 	Files:	NEWS (1.99) (+45 -1)
 		README (1.119) (+1 -1)
+		debian/README.Debian (1.38) (+1 -1)
 
 	Increment version
 
@@ -8551,6 +10717,12 @@
 
 2003-05-08	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.39) (+1 -5)
+
+	Remove debugging statements
+
+2003-05-08	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.98) (+27 -9)
 		src/foomatic/foomatic-printermap (1.56) (+291 -289)
 
@@ -8582,7 +10754,8 @@
 
 2003-05-07	<rlk@sourceforge.net>
 
-	Files:	src/main/print-color.c (1.75) (+2 -2)
+	Files:	src/libgimpprintui/panel.c (1.38) (+52 -9)
+		src/main/print-color.c (1.75) (+2 -2)
 		src/main/print-escp2.c (1.258) (+25 -6)
 
 	Epson driver: add ability to turn off dot resizing.
@@ -8594,7 +10767,7 @@
 2003-05-06	<rlk@sourceforge.net>
 
 	Files:	src/main/Makefile.am (1.68) (+2 -1)
-		src/main/escp2-driver.c (1.1) ( )
+		src/main/escp2-driver.c (1.1) (added)
 		src/main/print-escp2.c (1.257) (+57 -672)
 		src/main/print-escp2.h (1.45) (+101 -2)
 
@@ -8609,12 +10782,24 @@
 2003-05-05	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.61) (+4 -5)
+		doc/developer/integrating.texi (1.3) (+2 -2)
+		doc/developer/new-printer.texi (1.2) (+12 -12)
+		doc/developer/weave.texi (1.2) (+79 -151)
+		include/gimp-print/array.h (1.3) (+2 -2)
+		include/gimp-print/curve.h (1.4) (+3 -3)
+		include/gimp-print/gimp-print.h (1.34) (+3 -3)
+		include/gimp-print/sequence.h (1.2) (+16 -15)
 		po/cs.po (1.2) (+3348 -0)
 		scripts/autogen.sh (1.24) (+2 -2)
 		src/cups/genppd.c (1.67) (+11 -11)
 		src/escputil/escputil.c (1.54) (+12 -12)
 		src/foomatic/printer_options.c (1.25) (+6 -6)
 		src/gimp/print.c (1.54) (+1 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.11) (+2 -14)
+		src/libgimpprintui/panel.c (1.37) (+5 -5)
+		src/libgimpprintui/plist.c (1.27) (+4 -4)
+		src/libgimpprintui/printrc.h (1.3) (+1 -3)
+		src/libgimpprintui/printrcy.y (1.6) (+1 -2)
 		src/main/array.c (1.6) (+15 -26)
 		src/main/curve.c (1.34) (+41 -45)
 		src/main/dither-eventone.c (1.10) (+13 -13)
@@ -8637,6 +10822,7 @@
 		src/main/sequence.c (1.6) (+52 -44)
 		src/main/string-list.c (1.11) (+4 -4)
 		src/main/util.h (1.23) (+22 -24)
+		src/main/weave.h (1.9) (+16 -6)
 		src/main/xml.c (1.19) (+3 -3)
 		src/testpattern/run-testpattern (1.5) (+1 -1)
 		src/testpattern/testpattern.c (1.26) (+4 -4)
@@ -8659,7 +10845,7 @@
 
 2003-05-04	<rlk@sourceforge.net>
 
-	Files:	po/cs.po (1.1) ( )
+	Files:	po/cs.po (1.1) (added)
 
 	file cs.po was initially added on branch gimp-print-4_2_branch.
 
@@ -8673,6 +10859,9 @@
 
 	Files:	configure.ac (1.60) (+3 -10)
 		src/Makefile.am (1.16) (+2 -3)
+		src/printdef/.cvsignore (1.4) (removed)
+		src/printdef/Makefile.am (1.15) (removed)
+		src/printdef/printdef.c (1.10) (removed)
 
 	Remove printdef, which is now no longer used.
 
@@ -8706,11 +10895,13 @@
 
 	Files:	src/main/Makefile.am (1.67) (+2 -1)
 		src/main/bit-ops.c (1.4) (+16 -13)
+		src/main/bit-ops.h (1.1) (added)
 		src/main/print-canon.c (1.118) (+6 -6)
 		src/main/print-escp2.c (1.254) (+62 -71)
 		src/main/print-lexmark.c (1.118) (+78 -75)
 		src/main/print-pcl.c (1.103) (+7 -7)
 		src/main/print-weave.c (1.52) (+231 -147)
+		src/main/weave.h (1.8) (+37 -130)
 		test/escp2-weavetest.c (1.28) (+12 -15)
 		test/testdither.c (1.33) (+3 -2)
 
@@ -8726,6 +10917,7 @@
 		po/fr.po (1.37) (+1940 -843)
 		po/ja.po (1.11) (+1940 -843)
 		po/nl.po (1.17) (+1940 -844)
+		po/no.po (1.37) (+1967 -757)
 		po/pl.po (1.21) (+1982 -762)
 		po/pt.po (1.15) (+1941 -840)
 		po/sk.po (1.20) (+1941 -844)
@@ -8738,6 +10930,7 @@
 	Files:	NEWS (1.97) (+35 -1)
 		README (1.118) (+1 -1)
 		configure.ac (1.59) (+3 -3)
+		debian/README.Debian (1.37) (+1 -1)
 
 	Prep for 4.3.13
 
@@ -8750,21 +10943,37 @@
 
 2003-04-16	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.36) (+7 -1)
+
+	Fix memory leak
+
+2003-04-16	<rlk@sourceforge.net>
+
 	Files:	src/main/print-dither-matrices.c (1.20) (+10 -1)
 
 	Handle aspect ratio 3 dither screens
 
 2003-04-15	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.66) (+7 -7)
+	Files:	include/gimp-print/array.h (1.2) (+8 -7)
+		include/gimp-print/curve.h (1.3) (+27 -26)
+		include/gimp-print/gimp-print.h (1.33) (+101 -97)
+		src/cups/genppd.c (1.66) (+7 -7)
 		src/cups/rastertoprinter.c (1.62) (+4 -4)
 		src/escputil/escputil.c (1.53) (+8 -8)
 		src/foomatic/printer_margins.c (1.9) (+2 -2)
 		src/foomatic/printer_options.c (1.24) (+2 -2)
 		src/foomatic/printers.c (1.6) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.42) (+7 -7)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.10) (+3 -3)
+		src/libgimpprintui/panel.c (1.35) (+22 -16)
+		src/libgimpprintui/plist.c (1.26) (+4 -4)
+		src/libgimpprintui/ui-utils.c (1.6) (+2 -2)
 		src/main/array.c (1.5) (+7 -7)
+		src/main/color.h (1.7) (+4 -4)
 		src/main/curve.c (1.33) (+24 -24)
 		src/main/dither-main.c (1.15) (+3 -3)
+		src/main/dither.h (1.17) (+7 -7)
 		src/main/print-canon.c (1.117) (+29 -29)
 		src/main/print-color.c (1.73) (+27 -27)
 		src/main/print-dither-matrices.c (1.19) (+4 -4)
@@ -8777,8 +10986,10 @@
 		src/main/print-util.c (1.95) (+17 -17)
 		src/main/print-vars.c (1.47) (+40 -40)
 		src/main/printers.c (1.49) (+39 -39)
+		src/main/printers.h (1.10) (+16 -16)
 		src/main/string-list.c (1.10) (+4 -4)
 		src/main/util.h (1.22) (+18 -16)
+		src/main/vars.h (1.15) (+6 -6)
 		src/testpattern/printers.c (1.3) (+2 -2)
 		src/testpattern/testpattern.c (1.25) (+2 -2)
 		test/curve.c (1.15) (+58 -11)
@@ -8817,6 +11028,7 @@
 2003-04-13	<rlk@sourceforge.net>
 
 	Files:	src/main/array.c (1.4) (+1 -2)
+		src/main/dither.h (1.16) (+2 -4)
 		src/main/print-color.c (1.72) (+1 -2)
 
 	Clean up a few more header issues
@@ -8831,9 +11043,15 @@
 
 	Files:	src/main/Makefile.am (1.66) (+1 -6)
 		src/main/array.c (1.3) (+83 -1)
+		src/main/array.h (1.3) (removed)
 		src/main/bit-ops.c (1.3) (+2 -1)
 		src/main/curve.c (1.32) (+22 -9)
+		src/main/curve.h (1.4) (removed)
 		src/main/dither-main.c (1.14) (+1 -3)
+		src/main/dither.h (1.15) (+10 -2)
+		src/main/gimp-print-internal.h (1.69) (+2 -3)
+		src/main/list.h (1.6) (removed)
+		src/main/papers.h (1.10) (removed)
 		src/main/print-canon.c (1.116) (+2 -1)
 		src/main/print-dither-matrices.c (1.18) (+1 -76)
 		src/main/print-escp2.c (1.252) (+2 -1)
@@ -8843,8 +11061,12 @@
 		src/main/print-pcl.c (1.101) (+2 -1)
 		src/main/print-weave.c (1.51) (+2 -1)
 		src/main/printers.c (1.48) (+13 -3)
+		src/main/printers.h (1.9) (+2 -17)
 		src/main/sequence.c (1.5) (+24 -4)
+		src/main/sequence.h (1.2) (removed)
+		src/main/weave.h (1.7) (+2 -14)
 		src/main/xml.c (1.18) (+1 -2)
+		src/main/xml.h (1.5) (+4 -2)
 		test/escp2-weavetest.c (1.26) (+2 -1)
 		test/testdither.c (1.31) (+3 -2)
 
@@ -8870,13 +11092,18 @@
 		man/.cvsignore (1.6) (+1 -1)
 		scripts/.cvsignore (1.3) (+1 -0)
 		src/cups/.cvsignore (1.6) (+1 -0)
+		src/libgimpprintui/.cvsignore (1.4) (+6 -0)
 		src/main/.cvsignore (1.16) (+3 -0)
 
 	Ignore some more files
 
 2003-04-12	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.31) (+408 -1)
+	Files:	include/gimp-print/Makefile.am (1.11) (+1 -2)
+		include/gimp-print/curve.h (1.2) (+6 -18)
+		include/gimp-print/gimp-print.h (1.32) (+2 -3)
+		include/gimp-print/xml.h (1.2) (removed)
+		src/main/curve.c (1.31) (+408 -1)
 		src/main/print-dither-matrices.c (1.17) (+329 -20)
 		src/main/print-escp2.c (1.250) (+2 -2)
 		src/main/print-papers.c (1.21) (+178 -1)
@@ -8885,6 +11112,7 @@
 		src/main/sequence.c (1.4) (+238 -4)
 		src/main/util.h (1.21) (+22 -11)
 		src/main/xml.c (1.17) (+105 -1422)
+		src/main/xml.h (1.4) (+37 -5)
 		test/curve.c (1.14) (+4 -4)
 		test/run-weavetest (1.15) (+1 -1)
 
@@ -8923,6 +11151,9 @@
 2003-04-09	<rlk@sourceforge.net>
 
 	Files:	src/gimp/print.c (1.52) (+2 -1)
+		src/libgimpprintui/panel.c (1.34) (+18 -10)
+		src/libgimpprintui/plist.c (1.25) (+16 -8)
+		src/libgimpprintui/printrcy.y (1.5) (+9 -3)
 
 	Clean up some memory leaks.
 
@@ -8937,12 +11168,15 @@
 2003-04-09	<rlk@sourceforge.net>
 
 	Files:	src/cups/rastertoprinter.c (1.61) (+9 -5)
+		src/libgimpprintui/panel.c (1.33) (+16 -7)
 		src/main/dither-ed.c (1.4) (+4 -4)
 		src/main/dither-eventone.c (1.9) (+2 -2)
+		src/main/dither-fast.c (1.4) (+4 -4)
 		src/main/dither-inks.c (1.5) (+5 -5)
 		src/main/dither-main.c (1.13) (+97 -97)
 		src/main/dither-ordered.c (1.4) (+4 -4)
 		src/main/dither-very-fast.c (1.4) (+4 -4)
+		src/main/dither.h (1.14) (+2 -4)
 		src/main/print-canon.c (1.115) (+5 -6)
 		src/main/print-color.c (1.71) (+41 -47)
 		src/main/print-dither-matrices.c (1.16) (+7 -7)
@@ -8953,6 +11187,7 @@
 		src/main/print-vars.c (1.46) (+126 -58)
 		src/main/print-weave.c (1.50) (+6 -6)
 		src/main/printers.c (1.45) (+11 -10)
+		src/main/vars.h (1.14) (+11 -35)
 		test/testdither.c (1.30) (+2 -3)
 
 	Fix the CUPS driver: don't use the page number to decide whether to
@@ -8987,6 +11222,12 @@
 
 2003-04-08	<rlk@sourceforge.net>
 
+	Files:	src/ghost/ijsgimpprint.c (1.41) (+4 -3)
+
+	Improve a printf
+
+2003-04-08	<rlk@sourceforge.net>
+
 	Files:	src/main/curve.c (1.30) (+2 -2)
 
 	Set bounds correctly in rescale
@@ -9000,6 +11241,7 @@
 2003-04-07	<rleigh@sourceforge.net>
 
 	Files:	src/main/curve.c (1.29) (+97 -73)
+		src/main/curve.h (1.3) (+2 -4)
 		src/main/sequence.c (1.3) (+7 -10)
 		src/main/xml.c (1.16) (+227 -165)
 		test/curve.c (1.12) (+13 -15)
@@ -9085,10 +11327,17 @@
 
 	Translate strings in XML data files.
 
+2003-04-01	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/oldprinterids (1.1) (added)
+
+	file oldprinterids was initially added on branch gimp-print-4_2_branch.
+
 2003-03-31	<rleigh@sourceforge.net>
 
 	Files:	src/main/array.c (1.2) (+1 -9)
 		src/main/curve.c (1.28) (+52 -43)
+		src/main/curve.h (1.2) (+4 -3)
 		src/main/dither-impl.h (1.4) (+2 -10)
 		src/main/print-vars.c (1.44) (+1 -9)
 		src/main/sequence.c (1.2) (+1 -11)
@@ -9114,6 +11363,8 @@
 2003-03-30	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.58) (+3 -3)
+		src/libgimpprintui/plist.c (1.24) (+4 -4)
+		src/libgimpprintui/printrcl.l (1.4) (+2 -2)
 		src/main/curve.c (1.27) (+31 -16)
 		src/main/xml.c (1.14) (+26 -29)
 
@@ -9124,15 +11375,32 @@
 2003-03-30	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.57) (+3 -2)
+		include/gimp-print/Makefile.am (1.10) (+8 -2)
+		include/gimp-print/array.h (1.1) (added)
+		include/gimp-print/curve.h (1.1) (added)
+		include/gimp-print/gimp-print.h (1.31) (+25 -291)
+		include/gimp-print/xml.h (1.1) (added)
 		src/cups/Makefile.am (1.64) (+2 -1)
 		src/foomatic/Makefile.am (1.37) (+2 -1)
 		src/ghost/Makefile.am (1.30) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.40) (+10 -2)
 		src/gimp/Makefile.am (1.31) (+2 -2)
+		src/libgimpprintui/Makefile.am (1.4) (+2 -3)
+		src/libgimpprintui/plist.c (1.23) (+5 -4)
+		src/libgimpprintui/printrcy.y (1.4) (+2 -2)
+		src/main/1x1.mat (1.3) (removed)
+		src/main/2x1.mat (1.3) (removed)
+		src/main/4x1.mat (1.3) (removed)
 		src/main/Makefile.am (1.64) (+12 -8)
+		src/main/array.h (1.2) (+1 -24)
 		src/main/curve.c (1.26) (+233 -434)
+		src/main/curve.h (1.1) (added)
 		src/main/dither-main.c (1.12) (+15 -12)
+		src/main/dither.h (1.13) (+13 -10)
 		src/main/escp2-channels.c (1.3) (+40 -22)
 		src/main/escp2-papers.c (1.5) (+53 -29)
+		src/main/gimpprint.xsd (1.6) (+105 -5)
+		src/main/papers.h (1.9) (+18 -2)
 		src/main/papers.xml (1.9) (+1 -2)
 		src/main/print-canon.c (1.114) (+53 -29)
 		src/main/print-color.c (1.70) (+47 -11)
@@ -9143,9 +11411,11 @@
 		src/main/print-vars.c (1.43) (+95 -1)
 		src/main/printers.xml (1.70) (+1 -2)
 		src/main/xml.c (1.13) (+1140 -89)
+		src/main/xml.h (1.3) (+12 -6)
+		src/printdef/Makefile.am (1.14) (+2 -2)
 		test/Makefile.am (1.39) (+5 -3)
 		test/curve.c (1.11) (+379 -174)
-		test/xml-curve.c (1.1) ( )
+		test/xml-curve.c (1.1) (added)
 
 	Change curve data format to XML.
 	Use new array and sequence data types.
@@ -9166,6 +11436,7 @@
 		po/fr.po (1.36) (+476 -375)
 		po/ja.po (1.10) (+476 -375)
 		po/nl.po (1.16) (+464 -374)
+		po/no.po (1.36) (+469 -372)
 		po/pl.po (1.20) (+458 -371)
 		po/pt.po (1.14) (+476 -375)
 		po/sk.po (1.19) (+476 -375)
@@ -9190,6 +11461,7 @@
 	Files:	NEWS (1.94) (+28 -4)
 		README (1.117) (+1 -1)
 		configure.ac (1.56) (+3 -3)
+		debian/README.Debian (1.36) (+2 -2)
 
 	Prep for Gimp-Print 4.3.12
 
@@ -9219,6 +11491,7 @@
 
 	Files:	NEWS (1.93) (+3 -0)
 		src/foomatic/foomatic-printermap (1.52) (+2 -0)
+		src/ghost/README (1.87) (+23 -14)
 		src/main/escp2-inks.c (1.3) (+40 -1)
 		src/main/escp2-resolutions.c (1.4) (+4 -1)
 		src/main/print-escp2-data.c (1.98) (+80 -60)
@@ -9293,6 +11566,7 @@
 		src/main/print-escp2.c (1.238) (+419 -475)
 		src/main/print-lexmark.c (1.113) (+19 -18)
 		src/main/print-weave.c (1.49) (+25 -25)
+		src/main/weave.h (1.6) (+8 -8)
 		test/escp2-weavetest.c (1.25) (+6 -6)
 
 	Cleanup
@@ -9317,25 +11591,47 @@
 
 2003-03-19	<rleigh@sourceforge.net>
 
+	Files:	include/gimp-print/gimp-print.h (1.30) (+8 -8)
+
+	Remove unused enum names.  These confuse the gtk-doc parser, and are not
+	required by any code.
+
+2003-03-19	<rleigh@sourceforge.net>
+
 	Files:	src/main/module.c (1.11) (+3 -2)
 
 	Check that a module exists before attempting to close it.
 
 2003-03-19	<rleigh@sourceforge.net>
 
-	Files:	src/main/dither-matrix-1x1.xml (1.1) ( )
-		src/main/dither-matrix-2x1.xml (1.1) ( )
-		src/main/dither-matrix-4x1.xml (1.1) ( )
+	Files:	src/main/dither-matrix-1x1.xml (1.1) (added)
+		src/main/dither-matrix-2x1.xml (1.1) (added)
+		src/main/dither-matrix-4x1.xml (1.1) (added)
 
 	Add XML dither matrices.
 
 2003-03-19	<rleigh@sourceforge.net>
 
-	Files:	src/main/array.c (1.1) ( )
-		src/main/sequence.c (1.1) ( )
+	Files:	include/gimp-print/sequence.h (1.1) (added)
+		src/main/array.c (1.1) (added)
+		src/main/array.h (1.1) (added)
+		src/main/sequence.c (1.1) (added)
+		src/main/sequence.h (1.1) (added)
 
 	Add sequence and array (derived from sequence) objects.
 
+2003-03-19	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.55) (+12 -0)
+
+	Update for 4.3.11
+
+2003-03-19	<rleigh@sourceforge.net>
+
+	Files:	src/main/libgimpprint.sym (1.4) (+120 -2)
+
+	Update required symbols.
+
 2003-03-19	<rlk@sourceforge.net>
 
 	Files:	src/main/printers.c (1.44) (+3 -3)
@@ -9344,6 +11640,12 @@
 
 2003-03-19	<rlk@sourceforge.net>
 
+	Files:	src/ghost/ijsgimpprint.c (1.39) (+4 -4)
+
+	Fix roundoff error in calculating margins.
+
+2003-03-19	<rlk@sourceforge.net>
+
 	Files:	src/main/print-vars.c (1.42) (+2 -3)
 
 	Set all mandatory parameters in stp_set_printer_defaults.
@@ -9365,6 +11667,12 @@
 
 2003-03-16	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.32) (+2 -2)
+
+	Rename edit curve button
+
+2003-03-16	<rlk@sourceforge.net>
+
 	Files:	src/main/print-color.c (1.67) (+30 -8)
 
 	Offer linear vs. fixed endpoint contrast adjustment.
@@ -9384,7 +11692,14 @@
 
 2003-03-16	<rlk@sourceforge.net>
 
-	Files:	src/main/dither-main.c (1.10) (+2 -2)
+	Files:	src/libgimpprintui/panel.c (1.31) (+6 -4)
+
+	Don't incorrectly smash color values.
+
+2003-03-16	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.30) (+30 -2)
+		src/main/dither-main.c (1.10) (+2 -2)
 		src/main/escp2-papers.c (1.3) (+2 -2)
 		src/main/print-escp2-data.c (1.97) (+11 -11)
 		src/main/print-escp2.c (1.236) (+25 -21)
@@ -9406,12 +11721,16 @@
 
 2003-03-12	<rlk@sourceforge.net>
 
-	Files:	src/main/dither-inks.c (1.3) (+13 -3)
+	Files:	src/main/color.h (1.6) (+3 -3)
+		src/main/dither-inks.c (1.3) (+13 -3)
 		src/main/dither-main.c (1.9) (+30 -36)
+		src/main/dither.h (1.12) (+39 -34)
+		src/main/image.h (1.3) (+6 -6)
 		src/main/print-canon.c (1.112) (+266 -262)
 		src/main/print-lexmark.c (1.112) (+98 -113)
 		src/main/print-pcl.c (1.95) (+283 -236)
 		src/main/util.h (1.19) (+7 -7)
+		src/main/weave.h (1.5) (+7 -7)
 
 	Supply shades from all family drivers.
 
@@ -9425,6 +11744,13 @@
 
 	Fix the Stylus Photo 2200 and 10000 ink definitions
 
+2003-03-07	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/plist.c (1.22) (+30 -20)
+
+	Don't try to use the sync code if we're not printing to a process.
+	Thanks, Dave!
+
 2003-03-01	<rlk@sourceforge.net>
 
 	Files:	src/main/papers.xml (1.8) (+4 -4)
@@ -9433,6 +11759,18 @@
 
 2003-03-01	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.29) (+1 -2)
+
+	Minor cleanup
+
+2003-03-01	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.28) (+187 -110)
+
+	Some UI cleanup
+
+2003-03-01	<rlk@sourceforge.net>
+
 	Files:	po/da.po (1.28) (+272 -252)
 		po/de.po (1.14) (+274 -252)
 		po/el.po (1.15) (+274 -256)
@@ -9441,6 +11779,7 @@
 		po/fr.po (1.35) (+274 -252)
 		po/ja.po (1.9) (+274 -252)
 		po/nl.po (1.15) (+274 -252)
+		po/no.po (1.35) (+272 -252)
 		po/pl.po (1.19) (+273 -256)
 		po/pt.po (1.13) (+274 -252)
 		po/sk.po (1.18) (+274 -252)
@@ -9459,12 +11798,19 @@
 	Files:	NEWS (1.91) (+1 -1)
 		README (1.116) (+1 -1)
 		configure.ac (1.55) (+3 -3)
+		debian/README.Debian (1.35) (+1 -1)
 
 	Bump version
 
 2003-03-01	<rlk@sourceforge.net>
 
-	Files:	src/main/dither-main.c (1.8) (+19 -13)
+	Files:	include/gimp-print/gimp-print.h (1.29) (+6 -4)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.9) (+7 -5)
+		src/libgimpprintui/panel.c (1.27) (+127 -17)
+		src/libgimpprintui/plist.c (1.21) (+16 -6)
+		src/libgimpprintui/printrcl.l (1.3) (+2 -1)
+		src/libgimpprintui/printrcy.y (1.3) (+14 -2)
+		src/main/dither-main.c (1.8) (+19 -13)
 		src/main/papers.xml (1.7) (+105 -105)
 		src/main/print-vars.c (1.40) (+23 -5)
 		src/main/xml.c (1.12) (+10 -8)
@@ -9485,7 +11831,10 @@
 
 2003-02-26	<rlk@sourceforge.net>
 
-	Files:	src/main/escp2-resolutions.c (1.2) (+117 -253)
+	Files:	include/gimp-print/gimp-print.h (1.28) (+94 -101)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.8) (+9 -1)
+		src/libgimpprintui/panel.c (1.26) (+113 -13)
+		src/main/escp2-resolutions.c (1.2) (+117 -253)
 		src/main/print-canon.c (1.111) (+2 -2)
 		src/main/print-escp2.c (1.235) (+40 -6)
 		src/main/print-escp2.h (1.33) (+2 -3)
@@ -9507,6 +11856,7 @@
 
 	Files:	configure.ac (1.54) (+8 -3)
 		src/ghost/Makefile.am (1.29) (+3 -3)
+		src/ghost/ijsgimpprint.c (1.38) (+91 -2)
 
 	Handle all options in IJS driver
 
@@ -9518,10 +11868,17 @@
 
 2003-02-22	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.61) (+5 -5)
+	Files:	include/gimp-print/gimp-print.h (1.27) (+18 -16)
+		src/cups/genppd.c (1.61) (+5 -5)
 		src/cups/rastertoprinter.c (1.53) (+4 -4)
 		src/foomatic/paper_sizes.c (1.6) (+3 -5)
 		src/foomatic/printer_margins.c (1.8) (+4 -4)
+		src/ghost/README (1.86) (+13 -12)
+		src/ghost/ijsgimpprint.c (1.37) (+4 -6)
+		src/libgimpprintui/panel.c (1.25) (+8 -7)
+		src/main/gimpprint.dtd (1.4) (+31 -2)
+		src/main/gimpprint.xsd (1.5) (+21 -1)
+		src/main/papers.h (1.8) (+4 -20)
 		src/main/papers.xml (1.6) (+5 -1)
 		src/main/print-canon.c (1.110) (+54 -24)
 		src/main/print-escp2.c (1.234) (+58 -31)
@@ -9596,6 +11953,7 @@
 		po/fr.po (1.34) (+122 -122)
 		po/ja.po (1.8) (+122 -122)
 		po/nl.po (1.14) (+122 -122)
+		po/no.po (1.34) (+122 -122)
 		po/pl.po (1.18) (+122 -122)
 		po/pt.po (1.12) (+122 -122)
 		po/sk.po (1.17) (+122 -122)
@@ -9619,7 +11977,10 @@
 
 	Files:	NEWS (1.90) (+5 -2)
 		README (1.115) (+9 -9)
+		debian/README.Debian (1.34) (+1 -1)
+		include/gimp-print/gimp-print.h (1.26) (+7 -2)
 		src/gimp/print.c (1.51) (+2 -1)
+		src/libgimpprintui/panel.c (1.24) (+46 -15)
 		src/main/escp2-papers.c (1.2) (+17 -17)
 		src/main/print-canon.c (1.109) (+2 -1)
 		src/main/print-color.c (1.64) (+181 -298)
@@ -9657,6 +12018,7 @@
 		po/fr.po (1.33) (+1339 -1189)
 		po/ja.po (1.7) (+1339 -1189)
 		po/nl.po (1.13) (+1252 -1150)
+		po/no.po (1.33) (+998 -1063)
 		po/pl.po (1.17) (+1041 -1056)
 		po/pt.po (1.11) (+1343 -1194)
 		po/sk.po (1.16) (+1312 -1169)
@@ -9715,6 +12077,12 @@
 
 2003-02-14	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.23) (+43 -69)
+
+	Cleanup
+
+2003-02-14	<rlk@sourceforge.net>
+
 	Files:	src/main/print-color.c (1.61) (+24 -11)
 
 	Make gray component reduction a bit more intuitive
@@ -9724,11 +12092,18 @@
 	Files:	NEWS (1.88) (+39 -9)
 		README (1.114) (+1 -1)
 		configure.ac (1.52) (+3 -3)
+		debian/README.Debian (1.33) (+1 -1)
 
 	Bump the version.
 
 2003-02-14	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.22) (+25 -2)
+
+	Evidently a gtk_curve can exceed its bounds...
+
+2003-02-14	<rlk@sourceforge.net>
+
 	Files:	src/main/print-color.c (1.60) (+19 -12)
 
 	Separate the black curve from the composite curve (which is something
@@ -9742,14 +12117,21 @@
 
 2003-02-13	<rlk@sourceforge.net>
 
-	Files:	src/main/print-color.c (1.59) (+51 -22)
+	Files:	src/libgimpprintui/gimp-print-ui-internal.h (1.7) (+5 -9)
+		src/libgimpprintui/panel.c (1.21) (+377 -206)
+		src/libgimpprintui/ui-utils.c (1.5) (+29 -58)
+		src/main/print-color.c (1.59) (+51 -22)
 		src/main/print-raw.c (1.19) (+2 -1)
 
 	More curve improvements
 
 2003-02-13	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.24) (+67 -3)
+	Files:	include/gimp-print/gimp-print.h (1.25) (+18 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.6) (+15 -2)
+		src/libgimpprintui/panel.c (1.20) (+362 -46)
+		src/libgimpprintui/plist.c (1.20) (+3 -3)
+		src/main/curve.c (1.24) (+67 -3)
 		src/main/print-color.c (1.58) (+95 -35)
 		src/main/print-vars.c (1.36) (+2 -2)
 
@@ -9757,7 +12139,17 @@
 
 2003-02-09	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.48) (+12 -3)
+	Files:	include/gimp-print/gimp-print.h (1.24) (+73 -15)
+		src/gimp/print.c (1.48) (+12 -3)
+		src/libgimpprintui/.cvsignore (1.3) (+5 -0)
+		src/libgimpprintui/Makefile.am (1.3) (+10 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.5) (+59 -23)
+		src/libgimpprintui/panel.c (1.19) (+391 -218)
+		src/libgimpprintui/plist.c (1.19) (+100 -30)
+		src/libgimpprintui/printrc.h (1.2) (+42 -0)
+		src/libgimpprintui/printrcl.l (1.2) (+103 -0)
+		src/libgimpprintui/printrcy.y (1.2) (+262 -0)
+		src/libgimpprintui/ui-utils.c (1.4) (+117 -52)
 		src/main/dither-main.c (1.6) (+8 -8)
 		src/main/print-canon.c (1.108) (+8 -6)
 		src/main/print-color.c (1.57) (+20 -20)
@@ -9778,6 +12170,24 @@
 
 	Valgrind the code.
 
+2003-02-09	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrc.h (1.1) (added)
+
+	file printrc.h was initially added on branch ui-20030201-branch.
+
+2003-02-08	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrcy.y (1.1) (added)
+
+	file printrcy.y was initially added on branch ui-20030201-branch.
+
+2003-02-08	<rlk@sourceforge.net>
+
+	Files:	src/libgimpprintui/printrcl.l (1.1) (added)
+
+	file printrcl.l was initially added on branch ui-20030201-branch.
+
 2003-02-08	<rleigh@sourceforge.net>
 
 	Files:	src/cups/cups-genppdconfig.in (1.3) (+2 -2)
@@ -9796,7 +12206,10 @@
 
 2003-02-05	<rlk@sourceforge.net>
 
-	Files:	src/main/print-papers.c (1.18) (+2 -1)
+	Files:	src/main/gimp-print-internal.h (1.68) (+2 -5)
+		src/main/papers.h (1.7) (+2 -6)
+		src/main/print-papers.c (1.18) (+2 -1)
+		src/main/printers.h (1.8) (+3 -2)
 		src/main/util.h (1.16) (+4 -2)
 
 	Better factoring
@@ -9830,6 +12243,7 @@
 2003-01-27	<rlk@sourceforge.net>
 
 	Files:	README (1.113) (+1 -1)
+		debian/README.Debian (1.32) (+1 -1)
 
 	Prep for 4.3.8.
 
@@ -9843,10 +12257,10 @@
 
 	Files:	src/main/.cvsignore (1.15) (+4 -0)
 		src/main/Makefile.am (1.63) (+15 -14)
-		src/main/escp2-channels.c (1.1) ( )
-		src/main/escp2-inks.c (1.1) ( )
-		src/main/escp2-papers.c (1.1) ( )
-		src/main/escp2-resolutions.c (1.1) ( )
+		src/main/escp2-channels.c (1.1) (added)
+		src/main/escp2-inks.c (1.1) (added)
+		src/main/escp2-papers.c (1.1) (added)
+		src/main/escp2-resolutions.c (1.1) (added)
 		src/main/print-escp2-data.c (1.94) (+169 -4687)
 		src/main/print-escp2.h (1.31) (+35 -3)
 
@@ -9861,6 +12275,7 @@
 2003-01-26	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.51) (+9 -2)
+		src/printdef/Makefile.am (1.13) (+4 -1)
 
 	Do not build printdef by default
 
@@ -9872,14 +12287,25 @@
 
 2003-01-26	<rlk@sourceforge.net>
 
-	Files:	src/main/print-papers.c (1.17) (+5 -5)
+	Files:	src/main/1x1.mat (1.2) (+1 -1)
+		src/main/2x1.mat (1.2) (+1 -1)
+		src/main/4x1.mat (1.2) (+1 -1)
+		src/main/print-papers.c (1.17) (+5 -5)
 		src/main/printers.c (1.38) (+2 -2)
 
 	Fix a few minor things
 
+2003-01-26	<mtomlinson@sourceforge.net>
+
+	Files:	src/libgimpprintui/panel.c (1.18) (+13 -16)
+
+	Swap bottom and right border options in UI.
+	Fix a compiler warning on const-ness.
+
 2003-01-26	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2-data.c (1.92) (+2 -2)
+	Files:	src/main/dither.h (1.11) (+3 -3)
+		src/main/print-escp2-data.c (1.92) (+2 -2)
 
 	Reorder the elements in stpi_shade_t to avoid errors caused by using
 	the wrong data type in initializers.
@@ -9892,7 +12318,8 @@
 
 2003-01-26	<rlk@sourceforge.net>
 
-	Files:	src/main/dither-main.c (1.5) (+3 -3)
+	Files:	include/gimp-print/gimp-print.h (1.23) (+3 -2)
+		src/main/dither-main.c (1.5) (+3 -3)
 		src/main/print-canon.c (1.107) (+6 -6)
 		src/main/print-color.c (1.56) (+25 -25)
 		src/main/print-escp2.c (1.228) (+68 -64)
@@ -9914,13 +12341,21 @@
 
 2003-01-25	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/plist.c (1.18) (+132 -97)
+
+	Print error messages to the screen (via g_message) rather than to
+	stderr.
+
+2003-01-25	<rlk@sourceforge.net>
+
 	Files:	src/main/print-ps.c (1.56) (+2 -1)
 
 	Don't leave bounds.str set.
 
 2003-01-25	<davehill@sourceforge.net>
 
-	Files:	src/main/print-vars.c (1.33) (+4 -1)
+	Files:	src/libgimpprintui/plist.c (1.17) (+4 -4)
+		src/main/print-vars.c (1.33) (+4 -1)
 
 	plist.c: Make debug statements work after changes.
 	print-vars.c: Ensure bounds.str and deflt.str are NULL to avoid problems
@@ -9932,6 +12367,18 @@
 
 	Added missing HP inkjets.
 
+2003-01-24	<rleigh@sourceforge.net>
+
+	Files:	debian/rules (1.46) (+3 -3)
+
+	Copy updated config.sub and config.guess to the correct location
+
+2003-01-23	<rleigh@sourceforge.net>
+
+	Files:	debian/rules (1.45) (+2 -2)
+
+	Remove redundant escaping
+
 2003-01-23	<rleigh@sourceforge.net>
 
 	Files:	po/POTFILES.in (1.16) (+7 -1)
@@ -9940,7 +12387,8 @@
 
 2003-01-23	<rleigh@sourceforge.net>
 
-	Files:	src/main/print-list.c (1.7) (+5 -2)
+	Files:	src/main/libgimpprint.sym (1.3) (+0 -20)
+		src/main/print-list.c (1.7) (+5 -2)
 		src/main/print-papers.c (1.16) (+9 -1)
 		src/main/printers.c (1.37) (+10 -4)
 
@@ -9957,6 +12405,7 @@
 2003-01-23	<rlk@sourceforge.net>
 
 	Files:	src/gimp/print-intl.h (1.4) (+6 -8)
+		src/main/color.h (1.5) (+0 -11)
 		src/main/module.c (1.9) (+0 -1)
 		src/main/print-color.c (1.55) (+4 -31)
 
@@ -9965,6 +12414,7 @@
 2003-01-23	<rlk@sourceforge.net>
 
 	Files:	src/gimp/print-intl.h (1.3) (+9 -7)
+		src/main/color.h (1.4) (+12 -1)
 		src/main/module.c (1.8) (+2 -1)
 		src/main/print-color.c (1.54) (+32 -5)
 
@@ -9978,11 +12428,18 @@
 
 2003-01-20	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.59) (+8 -8)
+	Files:	include/gimp-print/gimp-print.h (1.22) (+7 -7)
+		src/cups/genppd.c (1.59) (+8 -8)
+		src/cups/gimp-print-cups.c (1.5) (+2 -2)
 		src/cups/rastertoprinter.c (1.50) (+6 -6)
 		src/foomatic/printer_margins.c (1.7) (+2 -2)
 		src/foomatic/printer_options.c (1.23) (+2 -2)
+		src/foomatic/stp_limits.c (1.10) (+3 -3)
+		src/ghost/ijsgimpprint.c (1.36) (+8 -8)
 		src/gimp/print-image-gimp.c (1.11) (+3 -3)
+		src/libgimpprintui/panel.c (1.17) (+3 -3)
+		src/libgimpprintui/plist.c (1.16) (+3 -3)
+		src/libgimpprintui/print-image-thumbnail.c (1.3) (+3 -3)
 		src/main/print-color.c (1.53) (+2 -2)
 		src/main/print-vars.c (1.32) (+4 -4)
 		src/main/printers.c (1.36) (+8 -8)
@@ -9994,18 +12451,26 @@
 
 	Files:	src/main/Makefile.am (1.62) (+1 -2)
 		src/main/bit-ops.c (1.2) (+29 -29)
+		src/main/color.h (1.3) (+5 -5)
 		src/main/curve.c (1.22) (+77 -77)
 		src/main/dither-ed.c (1.3) (+33 -33)
 		src/main/dither-eventone.c (1.4) (+40 -40)
+		src/main/dither-fast.c (1.3) (+12 -12)
 		src/main/dither-impl.h (1.3) (+32 -32)
 		src/main/dither-inks.c (1.2) (+58 -58)
 		src/main/dither-inlined-functions.h (1.2) (+4 -4)
 		src/main/dither-main.c (1.4) (+82 -82)
 		src/main/dither-ordered.c (1.3) (+14 -14)
 		src/main/dither-very-fast.c (1.3) (+13 -13)
+		src/main/dither.h (1.10) (+50 -50)
 		src/main/image.c (1.3) (+18 -18)
+		src/main/image.h (1.2) (+19 -19)
+		src/main/list.h (1.5) (+11 -11)
 		src/main/module.c (1.7) (+90 -90)
+		src/main/module.h (1.3) (+19 -19)
+		src/main/papers.h (1.6) (+8 -11)
 		src/main/path.c (1.6) (+26 -26)
+		src/main/path.h (1.2) (+4 -4)
 		src/main/print-canon.c (1.106) (+121 -121)
 		src/main/print-color.c (1.52) (+60 -60)
 		src/main/print-dither-matrices.c (1.13) (+59 -59)
@@ -10022,9 +12487,15 @@
 		src/main/print-vars.c (1.31) (+337 -331)
 		src/main/print-weave.c (1.48) (+187 -187)
 		src/main/printers.c (1.35) (+136 -125)
+		src/main/printers.h (1.7) (+18 -24)
+		src/main/printlist.h (1.3) (removed)
 		src/main/string-list.c (1.8) (+29 -29)
 		src/main/util.h (1.14) (+76 -76)
+		src/main/vars.h (1.13) (+33 -35)
+		src/main/weave.h (1.4) (+87 -91)
 		src/main/xml.c (1.9) (+68 -68)
+		src/main/xml.h (1.2) (+4 -4)
+		src/printdef/printdef.c (1.9) (+29 -29)
 		test/escp2-weavetest.c (1.24) (+8 -8)
 		test/testdither.c (1.28) (+64 -64)
 
@@ -10032,11 +12503,16 @@
 
 2003-01-20	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.58) (+6 -6)
+	Files:	include/gimp-print/gimp-print.h (1.21) (+114 -86)
+		src/cups/genppd.c (1.58) (+6 -6)
 		src/cups/rastertoprinter.c (1.49) (+6 -6)
 		src/foomatic/printer_margins.c (1.6) (+3 -3)
 		src/foomatic/printer_options.c (1.22) (+5 -5)
 		src/foomatic/printers.c (1.5) (+2 -2)
+		src/foomatic/stp_limits.c (1.9) (+3 -3)
+		src/ghost/ijsgimpprint.c (1.35) (+5 -5)
+		src/libgimpprintui/panel.c (1.16) (+9 -9)
+		src/libgimpprintui/plist.c (1.15) (+10 -10)
 		src/main/curve.c (1.21) (+23 -23)
 		src/main/dither-main.c (1.3) (+4 -4)
 		src/main/print-canon.c (1.105) (+20 -20)
@@ -10063,8 +12539,13 @@
 2003-01-20	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.50) (+3 -3)
+		include/gimp-print/gimp-print.h (1.20) (+2 -57)
 		src/cups/rastertoprinter.c (1.48) (+2 -3)
+		src/libgimpprintui/panel.c (1.15) (+1 -2)
+		src/main/gimp-print-internal.h (1.67) (+3 -3)
 		src/main/util.h (1.13) (+71 -7)
+		src/main/vars.h (1.12) (+5 -2)
+		src/printdef/printdef.c (1.8) (+2 -2)
 
 	Move stp_list_t and stp_set_output_type to internal header files
 
@@ -10086,6 +12567,21 @@
 	cups-genppdconfig uses -u to run non-interactively, instead of using a
 	different argv[0].
 
+2003-01-20	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.54) (+8 -0)
+		debian/control.in (1.32) (+46 -2)
+		debian/cupsys-driver-gimpprint.dirs (1.1) (added)
+		debian/cupsys-driver-gimpprint.install (1.4) (+0 -1)
+		debian/cupsys-driver-gimpprint.postinst (1.3) (+1 -0)
+		debian/cupsys-driver-gimpprint.prerm (1.1) (added)
+		debian/libgimpprint.install.in (1.2) (+1 -1)
+
+	Add libgimpprintui control data
+	Update version
+	cupsys-driver-gimpprint generates and updates PPDs in the postinst,
+	and removes them in prerm.
+
 2003-01-20	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/dither-eventone.c (1.3) (+13 -13)
@@ -10115,10 +12611,11 @@
 
 	Files:	src/main/.cvsignore (1.14) (+1 -0)
 		src/main/Makefile.am (1.61) (+2 -1)
-		src/main/bit-ops.c (1.1) ( )
+		src/main/bit-ops.c (1.1) (added)
 		src/main/print-escp2.c (1.223) (+24 -10)
 		src/main/print-lexmark.c (1.103) (+24 -14)
 		src/main/print-weave.c (1.47) (+18 -914)
+		src/main/weave.h (1.3) (+26 -17)
 
 	Clean up the weave code a bit
 
@@ -10133,6 +12630,7 @@
 		src/main/print-ps.c (1.52) (+3 -3)
 		src/main/print-raw.c (1.14) (+3 -3)
 		src/main/print-weave.c (1.46) (+6 -6)
+		src/main/weave.h (1.2) (+2 -22)
 
 	Name cleanup
 
@@ -10140,6 +12638,7 @@
 
 	Files:	src/main/dither-ed.c (1.2) (+47 -36)
 		src/main/dither-eventone.c (1.2) (+56 -53)
+		src/main/dither-fast.c (1.2) (+47 -36)
 		src/main/dither-impl.h (1.2) (+10 -15)
 		src/main/dither-main.c (1.2) (+32 -53)
 		src/main/dither-ordered.c (1.2) (+46 -35)
@@ -10149,10 +12648,16 @@
 
 2003-01-20	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.57) (+8 -8)
+	Files:	include/gimp-print/gimp-print.h (1.19) (+4 -2)
+		src/cups/genppd.c (1.57) (+8 -8)
+		src/cups/gimp-print-cups.c (1.4) (+2 -1)
 		src/cups/rastertoprinter.c (1.47) (+3 -3)
 		src/foomatic/printer_margins.c (1.5) (+2 -1)
 		src/foomatic/printer_options.c (1.21) (+2 -2)
+		src/foomatic/stp_limits.c (1.8) (+3 -1)
+		src/ghost/ijsgimpprint.c (1.34) (+3 -2)
+		src/libgimpprintui/panel.c (1.14) (+3 -1)
+		src/libgimpprintui/plist.c (1.14) (+5 -8)
 		src/main/print-vars.c (1.29) (+23 -2)
 		src/main/printers.c (1.32) (+11 -11)
 
@@ -10160,8 +12665,12 @@
 
 2003-01-20	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.46) (+2 -3)
+	Files:	include/gimp-print/gimp-print.h (1.18) (+2 -6)
+		src/cups/rastertoprinter.c (1.46) (+2 -3)
+		src/ghost/ijsgimpprint.c (1.33) (+4 -3)
 		src/gimp/print.c (1.47) (+2 -2)
+		src/libgimpprintui/panel.c (1.13) (+8 -5)
+		src/libgimpprintui/plist.c (1.13) (+21 -6)
 		src/main/print-ps.c (1.51) (+14 -7)
 		src/main/print-vars.c (1.28) (+1 -20)
 
@@ -10177,20 +12686,29 @@
 
 	Files:	src/main/.cvsignore (1.13) (+21 -10)
 		src/main/Makefile.am (1.60) (+10 -2)
-		src/main/dither-ed.c (1.1) ( )
-		src/main/dither-eventone.c (1.1) ( )
-		src/main/dither-impl.h (1.1) ( )
-		src/main/dither-inks.c (1.1) ( )
-		src/main/dither-inlined-functions.h (1.1) ( )
-		src/main/dither-main.c (1.1) ( )
-		src/main/dither-ordered.c (1.1) ( )
-		src/main/dither-very-fast.c (1.1) ( )
+		src/main/dither-ed.c (1.1) (added)
+		src/main/dither-eventone.c (1.1) (added)
+		src/main/dither-fast.c (1.1) (added)
+		src/main/dither-impl.h (1.1) (added)
+		src/main/dither-inks.c (1.1) (added)
+		src/main/dither-inlined-functions.h (1.1) (added)
+		src/main/dither-main.c (1.1) (added)
+		src/main/dither-ordered.c (1.1) (added)
+		src/main/dither-very-fast.c (1.1) (added)
 		src/main/print-dither-matrices.c (1.11) (+112 -4)
+		src/main/print-dither.c (1.120) (removed)
 
 	Split dither code up
 
 2003-01-20	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.12) (+6 -1)
+		src/libgimpprintui/plist.c (1.12) (+23 -8)
+
+	Fix some memory leaks and other problems
+
+2003-01-20	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.90) (+13 -13)
 
 	Fix up declarations of quadtone shades
@@ -10203,6 +12721,21 @@
 
 2003-01-19	<rleigh@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.7) (+4 -2)
+		debian/changelog (1.53) (+10 -0)
+		debian/cupsys-driver-gimpprint.install (1.3) (+4 -2)
+		debian/cupsys-driver-gimpprint.postinst (1.2) (+6 -2)
+		debian/libgimpprint-dev.install (1.3) (+0 -3)
+		debian/libgimpprint.install (1.3) (removed)
+		debian/libgimpprint.install.in (1.1) (added)
+		debian/libgimpprintui-dev.install (1.1) (added)
+		debian/libgimpprintui.install (1.1) (added)
+		debian/rules (1.44) (+12 -6)
+
+	Update Debian packaging to add libgimpprintui library and development packages
+
+2003-01-19	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.48) (+3 -2)
 		m4/stp_cups.m4 (1.7) (+6 -0)
 
@@ -10230,8 +12763,18 @@
 
 2003-01-19	<rlk@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.58) (+9 -6)
+	Files:	src/main/1x1.mat (1.1) (added)
+		src/main/2x1.mat (1.1) (added)
+		src/main/4x1.mat (1.1) (added)
+		src/main/Makefile.am (1.58) (+9 -6)
+		src/main/dither.h (1.9) (+7 -8)
+		src/main/gimpprint.dtd (1.3) (+5 -3)
+		src/main/gimpprint.xsd (1.4) (+49 -1)
 		src/main/print-dither-matrices.c (1.10) (+133 -25)
+		src/main/print-dither.c (1.119) (+14 -29)
+		src/main/quickmatrix257.h (1.5) (removed)
+		src/main/ran.367.179.h (1.5) (removed)
+		src/main/ran.509.131.h (1.5) (removed)
 		src/main/xml.c (1.7) (+50 -57)
 
 	Add more attributes to the DTD and the schema.
@@ -10264,7 +12807,11 @@
 
 2003-01-18	<rlk@sourceforge.net>
 
-	Files:	src/main/print-lexmark.c (1.101) (+12 -4)
+	Files:	include/gimp-print/gimp-print.h (1.17) (+5 -2)
+		src/libgimpprintui/panel.c (1.11) (+40 -34)
+		src/main/dither.h (1.8) (+2 -3)
+		src/main/print-dither.c (1.118) (+1 -19)
+		src/main/print-lexmark.c (1.101) (+12 -4)
 		src/main/print-pcl.c (1.84) (+11 -3)
 		src/main/print-vars.c (1.27) (+10 -1)
 
@@ -10272,17 +12819,24 @@
 
 2003-01-18	<rlk@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.57) (+1 -2)
+	Files:	include/gimp-print/gimp-print.h (1.16) (+58 -14)
+		src/libgimpprintui/panel.c (1.10) (+14 -9)
+		src/main/Makefile.am (1.57) (+1 -2)
 		src/main/curve.c (1.20) (+11 -12)
+		src/main/dither-matrices.h (1.2) (removed)
+		src/main/dither.h (1.7) (+65 -63)
+		src/main/gimp-print-internal.h (1.66) (+2 -3)
 		src/main/print-canon.c (1.102) (+52 -63)
 		src/main/print-color.c (1.50) (+270 -88)
 		src/main/print-dither-matrices.c (1.9) (+2 -2)
+		src/main/print-dither.c (1.117) (+259 -874)
 		src/main/print-escp2.c (1.221) (+104 -102)
 		src/main/print-lexmark.c (1.100) (+51 -73)
 		src/main/print-pcl.c (1.83) (+42 -52)
 		src/main/print-util.c (1.86) (+52 -1)
 		src/main/print-vars.c (1.26) (+238 -4)
 		src/main/util.h (1.12) (+7 -3)
+		src/main/vars.h (1.11) (+16 -5)
 		src/testpattern/run-testpattern (1.3) (+1 -1)
 		test/testdither.c (1.26) (+38 -46)
 
@@ -10298,6 +12852,12 @@
 
 2003-01-18	<mtomlinson@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.116) (+15 -3)
+
+	Allow amount of photo ink to be tuneable for EvenTone
+
+2003-01-18	<mtomlinson@sourceforge.net>
+
 	Files:	src/main/print-color.c (1.49) (+2 -2)
 
 	Make compute_a_curve work for steps != 256.
@@ -10317,9 +12877,13 @@
 
 2003-01-14	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.42) (+4 -3)
+	Files:	include/gimp-print/gimp-print.h (1.15) (+5 -6)
+		src/cups/rastertoprinter.c (1.42) (+4 -3)
+		src/ghost/ijsgimpprint.c (1.32) (+17 -5)
+		src/libgimpprintui/panel.c (1.9) (+2 -5)
 		src/main/print-canon.c (1.101) (+7 -9)
 		src/main/print-color.c (1.48) (+3 -175)
+		src/main/print-dither.c (1.115) (+1 -112)
 		src/main/print-escp2.c (1.220) (+3 -5)
 		src/main/print-lexmark.c (1.99) (+8 -20)
 		src/main/print-pcl.c (1.82) (+9 -12)
@@ -10328,10 +12892,21 @@
 
 	Remove monochrome output type (for now, at least)
 
+2003-01-13	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.114) (+84 -116)
+
+	Implemented new EvenTone raw CMYK (untested).
+
 2003-01-12	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.100) (+6 -6)
+	Files:	include/gimp-print/gimp-print.h (1.14) (+3 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.4) (+5 -6)
+		src/libgimpprintui/panel.c (1.8) (+96 -69)
+		src/libgimpprintui/ui-utils.c (1.3) (+18 -16)
+		src/main/print-canon.c (1.100) (+6 -6)
 		src/main/print-color.c (1.47) (+49 -35)
+		src/main/print-dither.c (1.113) (+2 -2)
 		src/main/print-escp2.c (1.219) (+14 -8)
 		src/main/print-lexmark.c (1.98) (+6 -6)
 		src/main/print-papers.c (1.12) (+5 -48)
@@ -10359,6 +12934,14 @@
 
 2003-01-11	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/panel.c (1.7) (+157 -148)
+
+	Split some things out.
+
+	Make plugin window resizable.
+
+2003-01-11	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.99) (+2 -2)
 		src/main/print-escp2.c (1.218) (+2 -2)
 		src/main/print-lexmark.c (1.97) (+2 -2)
@@ -10384,9 +12967,9 @@
 	Files:	configure.ac (1.46) (+5 -2)
 		man/Makefile.am (1.17) (+7 -2)
 		man/cups-genppdconfig.8.in (1.3) (+6 -5)
-		man/cups-genppdupdate.8.in (1.1) ( )
+		man/cups-genppdupdate.8.in (1.1) (added)
 		src/cups/Makefile.am (1.62) (+3 -3)
-		src/cups/cups-genppdupdate.in (1.1) ( )
+		src/cups/cups-genppdupdate.in (1.1) (added)
 
 	Add cups-genppdupdate, for upgrading PPDs between Gimp-Print revisions
 
@@ -10405,6 +12988,12 @@
 
 2003-01-11	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.112) (+33 -1)
+
+	Handle CMY printers correctly in CMYK mode.
+
+2003-01-11	<rlk@sourceforge.net>
+
 	Files:	src/testpattern/testpattern.c (1.21) (+3 -2)
 
 	Valgrind cleanup
@@ -10431,7 +13020,8 @@
 
 2003-01-11	<rlk@sourceforge.net>
 
-	Files:	src/main/print-lexmark.c (1.96) (+2 -1)
+	Files:	src/main/print-dither.c (1.111) (+78 -68)
+		src/main/print-lexmark.c (1.96) (+2 -1)
 		src/main/printers.c (1.28) (+4 -4)
 
 	Fix a few more problems from valgrind.
@@ -10450,7 +13040,8 @@
 
 2003-01-11	<rlk@sourceforge.net>
 
-	Files:	src/main/module.c (1.4) (+3 -6)
+	Files:	include/gimp-print/gimp-print.h (1.13) (+3 -3)
+		src/main/module.c (1.4) (+3 -6)
 		src/main/path.c (1.4) (+3 -5)
 		src/main/print-list.c (1.5) (+37 -35)
 		src/main/print-papers.c (1.11) (+2 -4)
@@ -10481,9 +13072,13 @@
 
 2003-01-10	<rlk@sourceforge.net>
 
-	Files:	src/foomatic/.cvsignore (1.7) (+1 -0)
+	Files:	include/gimp-print/gimp-print.h (1.12) (+5 -27)
+		src/foomatic/.cvsignore (1.7) (+1 -0)
+		src/libgimpprintui/plist.c (1.11) (+8 -5)
 		src/main/.cvsignore (1.12) (+3 -0)
+		src/main/gimp-print-internal.h (1.65) (+3 -6)
 		src/main/image.c (1.2) (+2 -1)
+		src/main/image.h (1.1) (added)
 		src/main/printers.c (1.25) (+19 -1)
 
 	Take image layer out of gimp-print.h
@@ -10496,7 +13091,10 @@
 
 2003-01-10	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.40) (+6 -2)
+	Files:	include/gimp-print/gimp-print.h (1.11) (+10 -3)
+		src/cups/rastertoprinter.c (1.40) (+6 -2)
+		src/ghost/ijsgimpprint.c (1.31) (+5 -1)
+		src/libgimpprintui/plist.c (1.10) (+10 -2)
 		src/main/print-vars.c (1.22) (+53 -66)
 		src/main/printers.c (1.24) (+17 -19)
 		src/main/string-list.c (1.4) (+50 -65)
@@ -10505,9 +13103,17 @@
 
 	Convert string list to use stp_list_t.
 
+2003-01-09	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.110) (+2 -2)
+
+	Fix sub-channel value printing EvenTone on 6 color printers.
+
 2003-01-09	<rlk@sourceforge.net>
 
-	Files:	src/main/module.c (1.3) (+6 -4)
+	Files:	include/gimp-print/gimp-print.h (1.10) (+23 -11)
+		src/main/list.h (1.4) (+6 -9)
+		src/main/module.c (1.3) (+6 -4)
 		src/main/path.c (1.2) (+1 -2)
 		src/main/print-list.c (1.4) (+79 -11)
 		src/main/print-papers.c (1.10) (+1 -2)
@@ -10522,6 +13128,12 @@
 
 2003-01-09	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/plist.c (1.9) (+275 -257)
+
+	Split printrc loader into separate functions for each format of printrc.
+
+2003-01-09	<rlk@sourceforge.net>
+
 	Files:	src/main/print-color.c (1.43) (+3 -3)
 
 	A few of the maps were reversed.
@@ -10534,7 +13146,9 @@
 
 2003-01-08	<mtomlinson@sourceforge.net>
 
-	Files:	src/main/print-escp2-data.c (1.88) (+731 -78)
+	Files:	src/main/dither.h (1.6) (+17 -3)
+		src/main/print-dither.c (1.109) (+530 -421)
+		src/main/print-escp2-data.c (1.88) (+731 -78)
 		src/main/print-escp2.c (1.216) (+12 -5)
 		src/main/print-escp2.h (1.29) (+5 -3)
 
@@ -10556,6 +13170,12 @@
 
 2003-01-07	<rleigh@sourceforge.net>
 
+	Files:	src/main/libgimpprint.sym (1.2) (+2 -2)
+
+	Sort the symbol list
+
+2003-01-07	<rleigh@sourceforge.net>
+
 	Files:	src/main/xml.c (1.3) (+1 -6)
 
 	Remove redundant code
@@ -10576,6 +13196,7 @@
 2003-01-07	<rleigh@sourceforge.net>
 
 	Files:	src/main/module.c (1.2) (+12 -1)
+		src/main/module.h (1.2) (+1 -6)
 
 	Fix MacOS/OpenBSD symbol prefix
 
@@ -10614,12 +13235,19 @@
 2003-01-06	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.42) (+79 -9)
+		m4/stp_pkgconfig.m4 (1.4) (+4 -4)
 		scripts/global.mk (1.2) (+3 -0)
 		src/Makefile.am (1.15) (+3 -3)
 		src/main/Makefile.am (1.52) (+58 -32)
-		src/main/module.c (1.1) ( )
+		src/main/gimp-print-internal.h (1.64) (+2 -3)
+		src/main/gimpprint.xsd (1.3) (+2 -8)
+		src/main/libgimpprint.sym (1.1) (added)
+		src/main/module.c (1.1) (added)
+		src/main/module.h (1.1) (added)
+		src/main/papers.h (1.5) (+27 -2)
 		src/main/papers.xml (1.4) (+8 -1)
-		src/main/path.c (1.1) ( )
+		src/main/path.c (1.1) (added)
+		src/main/path.h (1.1) (added)
 		src/main/print-canon.c (1.97) (+45 -2)
 		src/main/print-escp2.c (1.215) (+45 -3)
 		src/main/print-lexmark.c (1.95) (+44 -3)
@@ -10629,7 +13257,10 @@
 		src/main/print-raw.c (1.11) (+45 -2)
 		src/main/print-util.c (1.85) (+24 -5)
 		src/main/printers.c (1.22) (+114 -72)
-		src/main/xml.c (1.1) ( )
+		src/main/printers.h (1.6) (+29 -2)
+		src/main/xml.c (1.1) (added)
+		src/main/xml.h (1.1) (added)
+		src/printdef/printdef.c (1.7) (+1 -13)
 
 	Add binary module and XML data loaders to libgimpprint
 
@@ -10648,7 +13279,8 @@
 
 2003-01-06	<rlk@sourceforge.net>
 
-	Files:	src/main/print-color.c (1.42) (+273 -190)
+	Files:	include/gimp-print/gimp-print.h (1.9) (+3 -3)
+		src/main/print-color.c (1.42) (+273 -190)
 		src/main/print-raw.c (1.10) (+5 -2)
 		src/main/printers.c (1.21) (+31 -3)
 
@@ -10659,14 +13291,28 @@
 2003-01-06	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.30) (+9 -7)
+		src/foomatic/foomatic-templates-ijs/ImageOptimization.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/ImageType.xml (1.4) (removed)
+		src/ghost/README (1.85) (+9 -9)
 
 	Fix up the foomatic data
 
 2003-01-06	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.39) (+3 -4)
+	Files:	src/libgimpprintui/plist.c (1.8) (+18 -13)
+
+	Minor bug with saving printrc
+
+2003-01-06	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h (1.8) (+3 -12)
+		src/cups/rastertoprinter.c (1.39) (+3 -4)
 		src/foomatic/printer_margins.c (1.3) (+55 -41)
+		src/ghost/ijsgimpprint.c (1.30) (+5 -10)
 		src/gimp/print.c (1.46) (+2 -2)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.3) (+2 -1)
+		src/libgimpprintui/panel.c (1.6) (+30 -132)
+		src/libgimpprintui/plist.c (1.7) (+4 -5)
 		src/main/print-canon.c (1.96) (+1 -21)
 		src/main/print-color.c (1.41) (+21 -10)
 		src/main/print-escp2.c (1.214) (+2 -20)
@@ -10685,13 +13331,24 @@
 
 2003-01-05	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.55) (+4 -4)
+	Files:	include/gimp-print/gimp-print.h (1.7) (+17 -6)
+		src/cups/genppd.c (1.55) (+4 -4)
+		src/cups/gimp-print-cups.c (1.3) (+2 -2)
 		src/cups/rastertoprinter.c (1.38) (+4 -4)
 		src/escputil/escputil.c (1.50) (+2 -2)
 		src/foomatic/printer_options.c (1.20) (+2 -2)
+		src/foomatic/stp_limits.c (1.7) (+3 -3)
+		src/ghost/ijsgimpprint.c (1.29) (+10 -10)
+		src/gimp/instead_of_gimp_main.c (1.4) (+63 -63)
 		src/gimp/print-image-gimp.c (1.10) (+3 -3)
+		src/libgimpprintui/panel.c (1.5) (+6 -6)
+		src/libgimpprintui/plist.c (1.6) (+6 -6)
+		src/libgimpprintui/ui-utils.c (1.2) (+3 -3)
+		src/main/color.h (1.2) (+7 -1)
+		src/main/dither.h (1.5) (+9 -6)
 		src/main/print-canon.c (1.95) (+57 -6)
 		src/main/print-color.c (1.40) (+183 -1)
+		src/main/print-dither.c (1.108) (+94 -49)
 		src/main/print-escp2.c (1.213) (+119 -15)
 		src/main/print-lexmark.c (1.93) (+64 -13)
 		src/main/print-pcl.c (1.77) (+58 -7)
@@ -10699,6 +13356,8 @@
 		src/main/print-raw.c (1.9) (+38 -15)
 		src/main/print-vars.c (1.20) (+117 -257)
 		src/main/printers.c (1.19) (+67 -47)
+		src/main/printers.h (1.5) (+9 -2)
+		src/main/vars.h (1.10) (+4 -8)
 		src/testpattern/testpattern.c (1.20) (+3 -3)
 		test/testdither.c (1.24) (+33 -4)
 
@@ -10722,10 +13381,16 @@
 
 2003-01-05	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/printer_margins.c (1.1) ( )
+	Files:	src/foomatic/printer_margins.c (1.1) (added)
 
 	file printer_margins.c was initially added on branch gimp-print-4_2_branch.
 
+2003-01-05	<dpace@sourceforge.net>
+
+	Files:	src/gimp/instead_of_gimp_main.c (1.3) (+143 -989)
+
+	Cleaned up the code somewhat.
+
 2003-01-05	<rlk@sourceforge.net>
 
 	Files:	po/da.po (1.25) (+1246 -1094)
@@ -10736,6 +13401,7 @@
 		po/fr.po (1.32) (+1745 -1629)
 		po/ja.po (1.5) (+1684 -1569)
 		po/nl.po (1.12) (+1531 -1400)
+		po/no.po (1.32) (+1408 -1264)
 		po/pl.po (1.16) (+1332 -1175)
 		po/pt.po (1.10) (+1729 -1612)
 		po/sk.po (1.15) (+1711 -1594)
@@ -10753,6 +13419,7 @@
 
 	Files:	NEWS (1.84) (+66 -6)
 		README (1.111) (+1 -1)
+		debian/README.Debian (1.31) (+1 -1)
 
 	Prep for 4.3.7
 
@@ -10764,6 +13431,14 @@
 
 2003-01-05	<rlk@sourceforge.net>
 
+	Files:	RedHat/ghostscript-5.50.spec (1.2) (removed)
+		RedHat/gimp-print.spec (1.2) (removed)
+		RedHat/gs.spec.diff (1.2) (removed)
+
+	Remove extremely obsolete cruft
+
+2003-01-05	<rlk@sourceforge.net>
+
 	Files:	configure.ac (1.41) (+3 -3)
 
 	Bump version
@@ -10771,6 +13446,8 @@
 2003-01-05	<rlk@sourceforge.net>
 
 	Files:	src/gimp/print.c (1.45) (+10 -3)
+		src/libgimpprintui/panel.c (1.4) (+6 -2)
+		src/libgimpprintui/plist.c (1.5) (+67 -5)
 		src/main/print-ps.c (1.45) (+25 -8)
 		src/main/printers.c (1.18) (+37 -1)
 
@@ -10779,6 +13456,15 @@
 	Postscript driver should minimally handle all options it claims to
 	know about.
 
+2003-01-04	<dpace@sourceforge.net>
+
+	Files:	src/gimp/instead_of_gimp_main.c (1.2) (+207 -16)
+
+
+	instead_of_gimp_main.c is now changed to omit print.c usage.
+	Link instead_of_main.o with everything except print.o, libgimp.so and libgimpui.so
+	to create gimpprint-panel executable. dpace Jan 4, 2003.
+
 2003-01-03	<rleigh@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.49) (+26 -26)
@@ -10818,14 +13504,19 @@
 
 2003-01-02	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.94) (+6 -18)
+	Files:	src/libgimpprintui/.cvsignore (1.2) (+2 -0)
+		src/main/color.h (1.1) (added)
+		src/main/gimp-print-internal.h (1.63) (+3 -2)
+		src/main/print-canon.c (1.94) (+6 -18)
 		src/main/print-color.c (1.39) (+127 -58)
 		src/main/print-escp2.c (1.212) (+40 -48)
 		src/main/print-lexmark.c (1.92) (+22 -36)
 		src/main/print-pcl.c (1.76) (+22 -51)
 		src/main/print-ps.c (1.44) (+5 -20)
 		src/main/print-raw.c (1.8) (+5 -10)
+		src/main/printers.h (1.4) (+17 -2)
 		src/main/util.h (1.11) (+2 -42)
+		src/main/vars.h (1.9) (+5 -2)
 
 	Simplify the color interface
 
@@ -10833,23 +13524,33 @@
 
 	Files:	Makefile.am (1.133) (+4 -2)
 		configure.ac (1.38) (+52 -41)
+		debian/Makefile.am (1.6) (+3 -1)
 		doc/Makefile.am (1.32) (+2 -0)
 		doc/developer/Makefile.am (1.7) (+3 -1)
 		doc/users_guide/Makefile.am (1.36) (+3 -1)
 		include/Makefile.am (1.3) (+3 -1)
+		include/gimp-print/Makefile.am (1.9) (+3 -1)
+		lib/Makefile.am (1.5) (+7 -1)
+		lib/libprintut.h (1.7) (+1 -5)
+		lib/xgetcwd.c (1.2) (+7 -9)
 		m4/stp.m4 (1.4) (+0 -21)
 		m4/stp_cups.m4 (1.6) (+0 -1)
+		m4/stp_libconfig.m4 (1.3) (removed)
+		m4/stp_pkgconfig.m4 (1.3) (+34 -28)
 		man/Makefile.am (1.16) (+3 -1)
 		samples/Makefile.am (1.5) (+3 -1)
 		scripts/Makefile.am (1.2) (+4 -1)
-		scripts/global.mk (1.1) ( )
+		scripts/global.mk (1.1) (added)
 		src/Makefile.am (1.14) (+6 -1)
 		src/cups/Makefile.am (1.61) (+6 -14)
 		src/escputil/Makefile.am (1.14) (+1 -7)
 		src/foomatic/Makefile.am (1.32) (+8 -17)
 		src/ghost/Makefile.am (1.28) (+6 -13)
 		src/gimp/Makefile.am (1.29) (+6 -18)
+		src/libgimpprintui/Makefile.am (1.2) (+23 -4)
 		src/main/Makefile.am (1.50) (+6 -10)
+		src/main/gimpprint.m4.top (1.3) (removed)
+		src/printdef/Makefile.am (1.12) (+4 -3)
 		src/testpattern/Makefile.am (1.13) (+9 -14)
 		test/Makefile.am (1.38) (+7 -15)
 
@@ -10860,7 +13561,10 @@
 
 2003-01-01	<rlk@sourceforge.net>
 
-	Files:	src/main/print-dither-matrices.c (1.8) (+42 -1)
+	Files:	include/gimp-print/gimp-print.h (1.6) (+3 -3)
+		src/main/dither.h (1.4) (+7 -2)
+		src/main/print-dither-matrices.c (1.8) (+42 -1)
+		src/main/print-dither.c (1.107) (+25 -3)
 		src/main/print-escp2-data.c (1.87) (+27 -27)
 		src/main/print-escp2.c (1.211) (+58 -27)
 		src/main/print-escp2.h (1.28) (+6 -12)
@@ -10875,10 +13579,15 @@
 
 2003-01-01	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.37) (+4 -3)
+	Files:	include/gimp-print/gimp-print.h (1.5) (+18 -5)
+		src/cups/rastertoprinter.c (1.37) (+4 -3)
 		src/foomatic/printers.c (1.4) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.28) (+17 -7)
+		src/libgimpprintui/panel.c (1.3) (+12 -7)
+		src/libgimpprintui/plist.c (1.4) (+11 -6)
 		src/main/print-canon.c (1.93) (+52 -26)
 		src/main/print-color.c (1.38) (+137 -3)
+		src/main/print-dither.c (1.106) (+9 -6)
 		src/main/print-escp2-data.c (1.86) (+12 -1)
 		src/main/print-escp2.c (1.210) (+51 -14)
 		src/main/print-escp2.h (1.27) (+3 -2)
@@ -10891,16 +13600,20 @@
 		src/main/util.h (1.10) (+3 -4)
 		src/testpattern/.cvsignore (1.3) (+3 -0)
 		src/testpattern/Makefile.am (1.12) (+8 -1)
-		src/testpattern/printers.c (1.1) ( )
-		src/testpattern/run-testpattern (1.1) ( )
+		src/testpattern/printers.c (1.1) (added)
+		src/testpattern/run-testpattern (1.1) (added)
 		src/testpattern/testpattern.c (1.19) (+4 -5)
 
 	Actually set parameters in variables, rather than using fixed fields
 
 2003-01-01	<rlk@sourceforge.net>
 
-	Files:	src/main/print-list.c (1.3) (+27 -1)
+	Files:	src/main/gimp-print-internal.h (1.62) (+3 -4)
+		src/main/list.h (1.3) (+3 -1)
+		src/main/papers.h (1.4) (+2 -18)
+		src/main/print-list.c (1.3) (+27 -1)
 		src/main/print-papers.c (1.8) (+13 -2)
+		src/printdef/printdef.c (1.6) (+13 -1)
 
 	Add magic cookie checking to stp_list_t
 
@@ -10908,6 +13621,15 @@
 
 2003-01-01	<rlk@sourceforge.net>
 
+	Files:	src/libgimpprintui/gimp-print-ui-internal.h (1.2) (+3 -2)
+		src/libgimpprintui/panel.c (1.2) (+3 -3)
+		src/libgimpprintui/plist.c (1.3) (+2 -4)
+		src/libgimpprintui/print-image-thumbnail.c (1.2) (+3 -3)
+
+	Minor cleanup
+
+2003-01-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-vars.c (1.16) (+1 -51)
 
 	Remove stp_internal_option_t, which isn't how we're going to do
@@ -10915,8 +13637,11 @@
 
 2003-01-01	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.36) (+12 -9)
+	Files:	include/gimp-print/gimp-print.h (1.4) (+20 -3)
+		src/cups/rastertoprinter.c (1.36) (+12 -9)
 		src/foomatic/printer_options.c (1.19) (+12 -7)
+		src/foomatic/stp_limits.c (1.6) (+16 -13)
+		src/libgimpprintui/plist.c (1.2) (+16 -13)
 		src/main/print-vars.c (1.15) (+166 -73)
 		src/main/printers.c (1.16) (+8 -5)
 		src/testpattern/testpattern.c (1.18) (+12 -7)
@@ -10926,10 +13651,25 @@
 2002-12-31	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.37) (+18 -3)
+		include/gimp-print/Makefile.am (1.8) (+2 -2)
+		include/gimp-print/gimp-print-ui.h (1.1) (added)
 		src/Makefile.am (1.13) (+11 -2)
 		src/gimp/Makefile.am (1.28) (+6 -9)
+		src/gimp/gimp-print-ui-internal.h (1.4) (removed)
+		src/gimp/gimp-print-ui.h (1.5) (removed)
+		src/gimp/gimp_color_window.c (1.44) (removed)
+		src/gimp/gimp_main_window.c (1.105) (removed)
+		src/gimp/plist.c (1.5) (removed)
+		src/gimp/print-image-thumbnail.c (1.5) (removed)
 		src/gimp/print.c (1.44) (+4 -35)
 		src/gimp/print_gimp.h (1.41) (+7 -1)
+		src/libgimpprintui/.cvsignore (1.1) (added)
+		src/libgimpprintui/Makefile.am (1.1) (added)
+		src/libgimpprintui/gimp-print-ui-internal.h (1.1) (added)
+		src/libgimpprintui/panel.c (1.1) (added)
+		src/libgimpprintui/plist.c (1.1) (added)
+		src/libgimpprintui/print-image-thumbnail.c (1.1) (added)
+		src/libgimpprintui/ui-utils.c (1.1) (added)
 		src/main/.cvsignore (1.11) (+1 -0)
 		src/main/print-raw.c (1.6) (+5 -1)
 
@@ -10937,26 +13677,45 @@
 
 2002-12-31	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.43) (+4 -3)
+	Files:	src/gimp/gimp-print-ui.h (1.4) (+3 -3)
+		src/gimp/gimp_main_window.c (1.104) (+5 -10)
+		src/gimp/print.c (1.43) (+4 -3)
 		src/main/print-raw.c (1.5) (+1 -3)
 
 	More minor changes
 
+2002-12-30	<dpace@sourceforge.net>
+
+	Files:	src/gimp/instead_of_gimp_main.c (1.1) (added)
+
+	*** empty log message ***
+
 2002-12-30	<rlk@sourceforge.net>
 
 	Files:	src/gimp/Makefile.am (1.27) (+4 -2)
+		src/gimp/gimp-print-ui-internal.h (1.3) (+11 -11)
+		src/gimp/gimp-print-ui.h (1.3) (+31 -31)
+		src/gimp/gimp_color_window.c (1.43) (+5 -5)
+		src/gimp/gimp_main_window.c (1.103) (+25 -25)
+		src/gimp/plist.c (1.4) (+74 -74)
 		src/gimp/print.c (1.42) (+17 -17)
 
 	Rename some things
 
 2002-12-30	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.35) (+5 -3)
+	Files:	include/gimp-print/gimp-print.h (1.3) (+33 -3)
+		src/cups/rastertoprinter.c (1.35) (+5 -3)
+		src/ghost/ijsgimpprint.c (1.27) (+5 -28)
+		src/gimp/gimp-print-ui-internal.h (1.2) (+3 -1)
+		src/gimp/gimp-print-ui.h (1.2) (+19 -17)
+		src/gimp/plist.c (1.3) (+189 -22)
 		src/gimp/print-image-gimp.c (1.9) (+28 -12)
+		src/gimp/print-image-thumbnail.c (1.4) (+6 -4)
 		src/gimp/print.c (1.41) (+14 -157)
 		src/gimp/print_gimp.h (1.40) (+1 -9)
 		src/main/Makefile.am (1.49) (+2 -1)
-		src/main/image.c (1.1) ( )
+		src/main/image.c (1.1) (added)
 		src/main/print-canon.c (1.92) (+10 -9)
 		src/main/print-escp2.c (1.209) (+4 -2)
 		src/main/print-lexmark.c (1.90) (+10 -9)
@@ -10983,7 +13742,13 @@
 
 2002-12-30	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print-image-gimp.c (1.8) (+3 -3)
+	Files:	src/gimp/gimp-print-ui-internal.h (1.1) (added)
+		src/gimp/gimp-print-ui.h (1.1) (added)
+		src/gimp/gimp_color_window.c (1.42) (+136 -74)
+		src/gimp/gimp_main_window.c (1.102) (+202 -150)
+		src/gimp/plist.c (1.2) (+34 -7)
+		src/gimp/print-image-gimp.c (1.8) (+3 -3)
+		src/gimp/print-image-thumbnail.c (1.3) (+5 -5)
 		src/gimp/print.c (1.40) (+18 -20)
 		src/gimp/print_gimp.h (1.39) (+1 -107)
 
@@ -10991,8 +13756,13 @@
 
 2002-12-29	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.34) (+6 -2)
+	Files:	include/gimp-print/gimp-print.h (1.2) (+16 -3)
+		src/cups/rastertoprinter.c (1.34) (+6 -2)
+		src/foomatic/stp_limits.c (1.5) (+12 -1)
+		src/ghost/ijsgimpprint.c (1.26) (+12 -1)
 		src/gimp/Makefile.am (1.26) (+2 -1)
+		src/gimp/gimp_main_window.c (1.101) (+2 -2)
+		src/gimp/plist.c (1.1) (added)
 		src/gimp/print.c (1.39) (+18 -874)
 		src/gimp/print_gimp.h (1.38) (+8 -3)
 		src/main/print-vars.c (1.14) (+21 -2)
@@ -11004,6 +13774,12 @@
 
 2002-12-29	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/.cvsignore (1.2) (+1 -1)
+
+	One last file to ignore
+
+2002-12-29	<rlk@sourceforge.net>
+
 	Files:	.cvsignore (1.19) (+1 -0)
 
 	Another file that should be ignored
@@ -11048,19 +13824,54 @@
 
 2002-12-29	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.100) (+2 -2)
+
+	Use family driver rather than device name for deciding whether to use
+	PPD files (for now, at least)
+
+2002-12-29	<rlk@sourceforge.net>
+
+	Files:	src/printdef/.cvsignore (1.3) (+0 -3)
+
+	Some files not to ignore
+
+2002-12-29	<rlk@sourceforge.net>
+
 	Files:	src/cups/genppd.c (1.54) (+7 -7)
 
 	Use printer family rather than hard-coded printer names
 
+2002-12-29	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.99) (+24 -25)
+
+	Reduce flashing in the UI.
+
+	Don't actually change printer setting until user clicks OK on the
+	printer driver choice.
+
+2002-12-28	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/Makefile.am (1.7) (+3 -1)
+
+	Install gimp-print.h also
+
 2002-12-28	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.36) (+3 -3)
+		include/gimp-print/Makefile.am (1.6) (+6 -4)
+		include/gimp-print/gimp-print-version.h.in (1.1) (added)
+		include/gimp-print/gimp-print.h (1.1) (added)
+		include/gimp-print/gimp-print.h.in (1.35) (removed)
 		src/cups/genppd.c (1.53) (+3 -3)
 		src/cups/rastertoprinter.c (1.33) (+3 -3)
 		src/foomatic/printer_options.c (1.18) (+2 -2)
+		src/gimp/gimp_main_window.c (1.98) (+4 -4)
 		src/gimp/print.c (1.38) (+3 -3)
+		src/main/dither.h (1.3) (+36 -31)
 		src/main/print-canon.c (1.90) (+25 -25)
 		src/main/print-dither-matrices.c (1.7) (+17 -17)
+		src/main/print-dither.c (1.105) (+52 -49)
 		src/main/print-escp2-data.c (1.85) (+102 -102)
 		src/main/print-escp2.c (1.205) (+7 -7)
 		src/main/print-escp2.h (1.26) (+3 -3)
@@ -11070,6 +13881,8 @@
 		src/main/print-raw.c (1.3) (+5 -5)
 		src/main/print-vars.c (1.13) (+2 -2)
 		src/main/util.h (1.7) (+40 -29)
+		src/main/vars.h (1.8) (+9 -9)
+		src/printdef/Makefile.am (1.11) (+2 -2)
 		src/testpattern/testpattern.c (1.16) (+2 -2)
 		test/testdither.c (1.23) (+17 -17)
 
@@ -11079,7 +13892,17 @@
 
 2002-12-27	<rlk@sourceforge.net>
 
-	Files:	src/gimp/Makefile.am (1.25) (+2 -1)
+	Files:	src/gimp/print-image-thumbnail.c (1.2) (+6 -4)
+
+	Eliminate a silly memory leak.
+
+2002-12-27	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.34) (+11 -39)
+		src/gimp/Makefile.am (1.25) (+2 -1)
+		src/gimp/gimp_color_window.c (1.41) (+9 -9)
+		src/gimp/gimp_main_window.c (1.97) (+80 -44)
+		src/gimp/print-image-thumbnail.c (1.1) (added)
 		src/gimp/print.c (1.37) (+2 -3)
 		src/gimp/print_gimp.h (1.37) (+5 -1)
 		src/main/print-raw.c (1.2) (+76 -57)
@@ -11091,13 +13914,18 @@
 
 2002-12-27	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.52) (+4 -4)
+	Files:	include/gimp-print/gimp-print.h.in (1.33) (+3 -2)
+		src/cups/genppd.c (1.52) (+4 -4)
 		src/foomatic/printer_options.c (1.17) (+3 -2)
+		src/ghost/ijsgimpprint.c (1.25) (+4 -2)
+		src/gimp/gimp_main_window.c (1.96) (+3 -2)
 		src/main/Makefile.am (1.48) (+2 -1)
 		src/main/print-escp2.c (1.204) (+3 -3)
-		src/main/print-raw.c (1.1) ( )
+		src/main/print-raw.c (1.1) (added)
 		src/main/printers.c (1.14) (+10 -1)
 		src/main/printers.xml (1.64) (+7 -1)
+		src/main/printlist.h (1.2) (+3 -2)
+		src/printdef/printdef.c (1.5) (+3 -1)
 
 	Add raw family driver
 
@@ -11110,6 +13938,7 @@
 2002-12-26	<rlk@sourceforge.net>
 
 	Files:	src/main/curve.c (1.17) (+2 -2)
+		src/main/gimp-print-internal.h (1.61) (+2 -3)
 		src/main/print-canon.c (1.89) (+1 -2)
 		src/main/print-color.c (1.37) (+40 -14)
 		src/main/print-escp2.c (1.203) (+1 -2)
@@ -11120,8 +13949,12 @@
 		src/main/print-vars.c (1.12) (+106 -32)
 		src/main/print-weave.c (1.45) (+3 -5)
 		src/main/printers.c (1.13) (+42 -11)
+		src/main/printlist.h (1.1) (added)
 		src/main/string-list.c (1.3) (+2 -2)
 		src/main/util.h (1.5) (+5 -2)
+		src/main/vars.h (1.7) (+21 -60)
+		src/printdef/printdef.c (1.4) (+57 -142)
+		src/printdef/printdef.h (1.8) (removed)
 
 	Replace all uses of exit() with stp_abort()
 
@@ -11134,7 +13967,8 @@
 
 2002-12-26	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.48) (+3 -3)
+	Files:	include/gimp-print/gimp-print.h.in (1.32) (+3 -3)
+		src/escputil/escputil.c (1.48) (+3 -3)
 		src/main/print-canon.c (1.88) (+4 -4)
 		src/main/print-color.c (1.36) (+72 -82)
 		src/main/print-escp2.c (1.202) (+4 -4)
@@ -11146,12 +13980,17 @@
 
 2002-12-24	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.32) (+2 -3)
+	Files:	include/gimp-print/gimp-print.h.in (1.31) (+4 -18)
+		src/cups/rastertoprinter.c (1.32) (+2 -3)
+		src/ghost/ijsgimpprint.c (1.24) (+1 -2)
+		src/gimp/gimp_color_window.c (1.40) (+38 -3)
+		src/gimp/gimp_main_window.c (1.95) (+9 -2)
 		src/gimp/print-image-gimp.c (1.7) (+173 -60)
 		src/gimp/print.c (1.36) (+4 -13)
 		src/gimp/print_gimp.h (1.36) (+2 -2)
 		src/main/print-color.c (1.35) (+294 -1073)
 		src/main/print-vars.c (1.11) (+1 -24)
+		src/main/vars.h (1.6) (+4 -3)
 
 	Remove alpha and color map support from the core library
 
@@ -11165,12 +14004,21 @@
 
 	Files:	doc/developer/.cvsignore (1.3) (+1 -0)
 		src/main/.cvsignore (1.9) (+8 -0)
+		src/printdef/.cvsignore (1.2) (+1 -0)
 
 	Ignore a few things
 
 2002-12-23	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.87) (+3 -4)
+	Files:	include/gimp-print/gimp-print.h.in (1.30) (+3 -3)
+
+	Silly typo
+
+2002-12-23	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.29) (+19 -24)
+		src/gimp/gimp_main_window.c (1.94) (+4 -4)
+		src/main/print-canon.c (1.87) (+3 -4)
 		src/main/print-color.c (1.34) (+147 -126)
 		src/main/print-escp2.c (1.201) (+3 -5)
 		src/main/print-lexmark.c (1.86) (+4 -5)
@@ -11199,6 +14047,7 @@
 		po/fr.po (1.31) (+1114 -1243)
 		po/ja.po (1.4) (+1113 -1241)
 		po/nl.po (1.11) (+1043 -1217)
+		po/no.po (1.31) (+903 -1209)
 		po/pl.po (1.15) (+1063 -1408)
 		po/pt.po (1.9) (+1130 -1247)
 		po/sk.po (1.14) (+1112 -1243)
@@ -11208,6 +14057,12 @@
 
 2002-12-22	<rlk@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.5) (+1 -2)
+
+	Cleanup
+
+2002-12-22	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.83) (+23 -12)
 
 	Prep for Gimp-Print 4.3.6
@@ -11226,7 +14081,10 @@
 
 2002-12-21	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.35) (+6 -5)
+	Files:	include/gimp-print/gimp-print.h.in (1.28) (+47 -6)
+		src/gimp/gimp_color_window.c (1.39) (+20 -4)
+		src/gimp/gimp_main_window.c (1.93) (+33 -12)
+		src/gimp/print_gimp.h (1.35) (+6 -5)
 		src/main/curve.c (1.16) (+155 -28)
 		src/main/print-canon.c (1.86) (+67 -262)
 		src/main/print-color.c (1.33) (+333 -311)
@@ -11254,20 +14112,41 @@
 		configure.ac (1.33) (+15 -2)
 		src/foomatic/Makefile.am (1.31) (+12 -2)
 		src/foomatic/foomatic-generator.in (1.27) (+505 -5)
+		src/foomatic/foomatic-templates-ijs/Brightness.xml (1.4) (+1 -1)
 		src/foomatic/foomatic-templates-ijs/Color.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Contrast.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Cyan.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Density.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/DitherAlgorithm.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Gamma.xml (1.4) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/ImageType.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/InkType.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/InputSlot.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Magenta.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/MediaType.xml (1.3) (+1 -1)
 		src/foomatic/foomatic-templates-ijs/Model.xml (1.3) (+1 -1)
 		src/foomatic/foomatic-templates-ijs/PageSize.xml (1.3) (+1 -1)
 		src/foomatic/foomatic-templates-ijs/PrintoutMode.xml (1.2) (+19 -0)
+		src/foomatic/foomatic-templates-ijs/Quality.xml (1.3) (+1 -1)
 		src/foomatic/foomatic-templates-ijs/Resolution.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Saturation.xml (1.4) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/Yellow.xml (1.3) (+1 -1)
 
 	Added "PrintoutMode" and option grouping to the Foomatic generator (for Foomatic 2.9.x).
 
 2002-12-18	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-templates-ijs/PrintoutMode.xml (1.1) ( )
+	Files:	src/foomatic/foomatic-templates-gs/PrintoutMode.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/PrintoutMode.xml (1.1) (added)
 
 	file PrintoutMode.xml was initially added on branch gimp-print-4_2_branch.
 
+2002-12-10	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.52) (+4 -1)
+
+	Add dependency fixes
+
 2002-12-09	<rleigh@sourceforge.net>
 
 	Files:	src/testpattern/Makefile.am (1.11) (+3 -4)
@@ -11296,13 +14175,56 @@
 
 2002-12-09	<rleigh@sourceforge.net>
 
+	Files:	include/gimp-print/Makefile.am (1.5) (+2 -2)
+
+	Don't distribute gimp-print.h, since it's generated by configure
+
+2002-12-09	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.51) (+7 -1)
+		debian/control.in (1.31) (+6 -5)
+		debian/cupsys-driver-gimpprint.files (1.9) (removed)
+		debian/cupsys-driver-gimpprint.install (1.2) (+11 -0)
+		debian/escputil.files (1.4) (removed)
+		debian/escputil.install (1.2) (+2 -0)
+		debian/foomatic-db-gimp-print.files (1.2) (removed)
+		debian/foomatic-db-gimp-print.install (1.2) (+2 -0)
+		debian/gimp1.2-print.files (1.3) (removed)
+		debian/gimp1.2-print.install (1.2) (+4 -0)
+		debian/gimpprint-doc.doc-base (1.2) (+1 -1)
+		debian/gimpprint-doc.install (1.2) (+11 -0)
+		debian/gimpprint-locales.files (1.2) (removed)
+		debian/gimpprint-locales.install (1.2) (+1 -0)
+		debian/ijsgimpprint.files (1.3) (removed)
+		debian/ijsgimpprint.install (1.2) (+2 -0)
+		debian/libgimpprint-dev.files (1.6) (removed)
+		debian/libgimpprint-dev.install (1.2) (+9 -0)
+		debian/libgimpprint-doc.install.in (1.2) (+2 -0)
+		debian/libgimpprint.files (1.8) (removed)
+		debian/libgimpprint.install (1.2) (+2 -0)
+		debian/rules (1.43) (+31 -32)
+
+	Sync debian packaging with the 4.2-branch:
+	Use debian/build and debian/install instead of debian/gimp-print-build
+	and debian/gimp-print-install, respectively.
+	Use dh_install rather than dh_movefiles.  This makes debian/rules
+	slightly cleaner, and debian/install is unchanged after install.
+	Create symlinks for HTML manuals, since different versions of
+	texi2html and db2html create different names.
+
+2002-12-09	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.32) (+2 -3)
+		debian/Makefile.am (1.4) (+15 -10)
 
 	Don't generate or clean debian/control (it's created by make dist)
 
 2002-12-08	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.31) (+80 -72)
+	Files:	include/gimp-print/gimp-print.h.in (1.27) (+19 -2)
+		src/cups/rastertoprinter.c (1.31) (+80 -72)
+		src/ghost/README (1.84) (+27 -3)
+		src/ghost/ijsgimpprint.c (1.23) (+8 -2)
 		src/main/print-canon.c (1.85) (+4 -2)
 		src/main/print-escp2-data.c (1.83) (+44 -5)
 		src/main/print-escp2.c (1.199) (+169 -100)
@@ -11313,9 +14235,70 @@
 		src/main/print-vars.c (1.9) (+12 -4)
 		src/main/printers.c (1.12) (+33 -1)
 		src/main/util.h (1.3) (+4 -2)
+		src/main/vars.h (1.5) (+4 -2)
 
 	Add cutter support
 
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/libgimpprint.install (1.1) (added)
+
+	file libgimpprint.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/libgimpprint-doc.install.in (1.1) (added)
+
+	file libgimpprint-doc.install.in was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/libgimpprint-dev.install (1.1) (added)
+
+	file libgimpprint-dev.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/ijsgimpprint.install (1.1) (added)
+
+	file ijsgimpprint.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/gimpprint-locales.install (1.1) (added)
+
+	file gimpprint-locales.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/gimpprint-doc.install (1.1) (added)
+
+	file gimpprint-doc.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/gimp1.2-print.install (1.1) (added)
+
+	file gimp1.2-print.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/foomatic-db-gimp-print.install (1.1) (added)
+
+	file foomatic-db-gimp-print.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/escputil.install (1.1) (added)
+
+	file escputil.install was initially added on branch gimp-print-4_2_branch.
+
+2002-12-08	<rleigh@sourceforge.net>
+
+	Files:	debian/cupsys-driver-gimpprint.install (1.1) (added)
+
+	file cupsys-driver-gimpprint.install was initially added on branch gimp-print-4_2_branch.
+
 2002-12-08	<rlk@sourceforge.net>
 
 	Files:	scripts/autogen.sh (1.23) (+1 -1)
@@ -11330,6 +14313,12 @@
 
 2002-12-08	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_color_window.c (1.38) (+3 -3)
+
+	Sily brainoc
+
+2002-12-08	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.82) (+3 -3)
 
 	Play it safe; always use the documented number of nozzles.
@@ -11384,7 +14373,9 @@
 
 2002-12-07	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.34) (+3 -1)
+	Files:	src/gimp/gimp_color_window.c (1.37) (+7 -3)
+		src/gimp/gimp_main_window.c (1.92) (+2 -2)
+		src/gimp/print_gimp.h (1.34) (+3 -1)
 
 	Handle dither algorithm option correctly
 
@@ -11404,6 +14395,12 @@
 
 2002-12-06	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.104) (+17 -1)
+
+	Handle grayscale correctly.
+
+2002-12-06	<rlk@sourceforge.net>
+
 	Files:	src/escputil/escputil.c (1.45) (+3 -2)
 
 	Handle 7-color printers
@@ -11471,7 +14468,8 @@
 
 2002-11-28	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.9) (+131 -111)
+	Files:	include/gimp-print/gimp-print.h.in (1.26) (+8 -6)
+		src/main/curve.c (1.9) (+131 -111)
 		test/curve.c (1.4) (+14 -4)
 
 	Some more cleanup and fixes
@@ -11492,13 +14490,18 @@
 
 2002-11-28	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.33) (+4 -5)
+	Files:	src/gimp/gimp_color_window.c (1.36) (+3 -15)
+		src/gimp/gimp_main_window.c (1.91) (+8 -30)
+		src/gimp/print_gimp.h (1.33) (+4 -5)
 
 	Back out incorrect checkins
 
 2002-11-28	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.32) (+6 -5)
+	Files:	include/gimp-print/gimp-print.h.in (1.25) (+2 -4)
+		src/gimp/gimp_color_window.c (1.35) (+16 -4)
+		src/gimp/gimp_main_window.c (1.90) (+31 -9)
+		src/gimp/print_gimp.h (1.32) (+6 -5)
 		src/main/curve.c (1.8) (+100 -107)
 		test/curve.c (1.3) (+48 -5)
 
@@ -11506,6 +14509,18 @@
 
 2002-11-28	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_color_window.c (1.34) (+4 -4)
+
+	Handle dither algorithm that shouldn't be there.
+
+2002-11-28	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.89) (+5 -4)
+
+	Handle options that aren't supposed to be set.
+
+2002-11-28	<rlk@sourceforge.net>
+
 	Files:	test/curve.c (1.2) (+34 -2)
 
 	More tests
@@ -11531,9 +14546,10 @@
 
 2002-11-27	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.7) (+156 -86)
+	Files:	include/gimp-print/gimp-print.h.in (1.24) (+4 -3)
+		src/main/curve.c (1.7) (+156 -86)
 		test/Makefile.am (1.36) (+5 -2)
-		test/curve.c (1.1) ( )
+		test/curve.c (1.1) (added)
 
 	First testing of the curve code
 
@@ -11545,14 +14561,28 @@
 
 2002-11-27	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.6) (+100 -9)
+	Files:	include/gimp-print/gimp-print.h.in (1.23) (+10 -6)
+
+	Minor updates
+
+2002-11-27	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.22) (+12 -3)
+		src/main/curve.c (1.6) (+100 -9)
 		src/main/printers.c (1.11) (+1 -2)
 
 	Allow curve rescaling in more elaborate ways
 
+2002-11-26	<rlk@sourceforge.net>
+
+	Files:	scripts/texinfo.tex (1.3) (removed)
+
+	texinfo.tex should not be in the repository; it comes from automake
+
 2002-11-24	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.5) (+156 -8)
+	Files:	include/gimp-print/gimp-print.h.in (1.21) (+54 -8)
+		src/main/curve.c (1.5) (+156 -8)
 
 	Add curve composition, fix a few inspection bugs
 
@@ -11570,11 +14600,13 @@
 
 2002-11-24	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.35) (+5 -7)
+	Files:	include/gimp-print/gimp-print.h.in (1.20) (+176 -11)
+		src/gimp/print.c (1.35) (+5 -7)
 		src/main/Makefile.am (1.44) (+2 -1)
 		src/main/curve.c (1.3) (+172 -105)
 		src/main/print-vars.c (1.8) (+3 -3)
 		src/main/printers.c (1.10) (+3 -11)
+		src/main/printers.h (1.3) (+4 -4)
 
 	Curve code compiles
 
@@ -11593,8 +14625,13 @@
 2002-11-23	<rleigh@sourceforge.net>
 
 	Files:	src/main/Makefile.am (1.43) (+11 -6)
-		src/main/papers.xml (1.1) ( )
+		src/main/gimpprint.dtd (1.2) (+51 -2)
+		src/main/gimpprint.xsd (1.2) (+55 -1)
+		src/main/papers.h (1.3) (+16 -2)
+		src/main/papers.xml (1.1) (added)
 		src/main/print-papers.c (1.7) (+2 -316)
+		src/printdef/Makefile.am (1.10) (+4 -4)
+		src/printdef/printdef.c (1.3) (+235 -50)
 
 	Move paper size definitions into an XML file, papers.xml
 	Modify printdef.c to generate paper header
@@ -11603,7 +14640,7 @@
 
 2002-11-23	<rlk@sourceforge.net>
 
-	Files:	src/main/curve.c (1.1) ( )
+	Files:	src/main/curve.c (1.1) (added)
 
 	Check in initial curve code (not compiled in just yet).
 
@@ -11623,22 +14660,35 @@
 
 2002-11-22	<rleigh@sourceforge.net>
 
-	Files:	src/main/printers.xml (1.61) (+41 -41)
+	Files:	src/main/gimpprint.dtd (1.1) (added)
+		src/main/gimpprint.xsd (1.1) (added)
+		src/main/printers.xml (1.61) (+41 -41)
 
 	Add XML DTD and Schema for validating printers.xml
 	Modify printers.xml to comply with the schema
 
 2002-11-22	<rlk@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.59) (+3 -3)
+	Files:	include/gimp-print/gimp-print.h.in (1.19) (+391 -300)
+		src/cups/Makefile.am (1.59) (+3 -3)
 		src/cups/genppd.c (1.51) (+52 -143)
+		src/cups/gimp-print-cups.c (1.2) (+96 -0)
+		src/cups/gimp-print-cups.h (1.2) (+59 -0)
 		src/cups/rastertoprinter.c (1.30) (+71 -123)
 		src/foomatic/printer_options.c (1.16) (+43 -50)
+		src/foomatic/stp_limits.c (1.4) (+20 -60)
+		src/ghost/ijsgimpprint.c (1.22) (+66 -114)
+		src/gimp/gimp_color_window.c (1.33) (+59 -80)
+		src/gimp/gimp_main_window.c (1.88) (+254 -318)
 		src/gimp/print.c (1.34) (+135 -203)
 		src/gimp/print_gimp.h (1.31) (+2 -2)
 		src/main/Makefile.am (1.42) (+3 -2)
+		src/main/dither.h (1.2) (+3 -3)
+		src/main/gimp-print-internal.h (1.60) (+8 -2)
+		src/main/papers.h (1.2) (+4 -5)
 		src/main/print-canon.c (1.84) (+93 -168)
 		src/main/print-color.c (1.32) (+28 -28)
+		src/main/print-dither.c (1.103) (+4 -10)
 		src/main/print-escp2.c (1.194) (+135 -170)
 		src/main/print-lexmark.c (1.83) (+93 -143)
 		src/main/print-papers.c (1.6) (+4 -6)
@@ -11647,8 +14697,14 @@
 		src/main/print-util.c (1.79) (+38 -101)
 		src/main/print-vars.c (1.7) (+419 -155)
 		src/main/printers.c (1.9) (+126 -157)
+		src/main/printers.h (1.2) (+4 -7)
+		src/main/quickmatrix257.h (1.4) (+2 -8)
+		src/main/ran.367.179.h (1.4) (+2 -7)
+		src/main/ran.509.131.h (1.4) (+2 -6)
 		src/main/string-list.c (1.2) (+142 -0)
 		src/main/util.h (1.2) (+15 -19)
+		src/main/vars.h (1.4) (+20 -9)
+		src/printdef/printdef.c (1.2) (+3 -1)
 		src/testpattern/testpattern.c (1.15) (+18 -16)
 		src/testpattern/testpatterny.y (1.7) (+2 -2)
 		test/run-testdither (1.4) (+1 -1)
@@ -11666,6 +14722,7 @@
 
 	Files:	man/cups-calibrate.8.in (1.5) (+3 -3)
 		man/escputil.1.in (1.9) (+31 -30)
+		man/gimpprint.3.in (1.5) (+1 -1)
 
 	Update manual pages
 
@@ -11680,6 +14737,11 @@
 	Files:	configure.ac (1.31) (+2 -0)
 		src/main/Makefile.am (1.40) (+8 -7)
 		src/main/printers.xml (1.60) (+1252 -1620)
+		src/printdef/Makefile.am (1.9) (+4 -11)
+		src/printdef/printdef.c (1.1) (added)
+		src/printdef/printdef.h (1.7) (+10 -76)
+		src/printdef/printdefl.l (1.3) (removed)
+		src/printdef/printdefy.y (1.12) (removed)
 
 	printdef uses libxml2 to read printers.xml
 	Make printers.xml into valid XML, using gimp-print schema
@@ -11695,17 +14757,35 @@
 
 2002-11-18	<rleigh@sourceforge.net>
 
+	Files:	debian/cupsys-driver-gimpprint.files (1.8) (+10 -10)
+		debian/gimp1.2-print.files (1.2) (+1 -1)
+		debian/rules (1.42) (+1 -3)
+
+	Don't use absolute pathnames in file lists
+	Remove gimp1.2-print special directory creation
+
+2002-11-18	<rleigh@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.78) (+2 -1)
 		src/main/printers.c (1.8) (+123 -21)
+		src/printdef/printdefy.y (1.11) (+3 -66)
 
 	Move the printer list from a static array to a stp_list_t list.
 
 2002-11-18	<rleigh@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.102) (+1 -2)
+		src/main/print-dither.h (1.2) (removed)
+
+	Remove redundant header print-dither.h
+
+2002-11-18	<rleigh@sourceforge.net>
+
 	Files:	src/cups/genppd.c (1.50) (+19 -18)
 		src/foomatic/paper_sizes.c (1.5) (+3 -1)
 		src/foomatic/printer_options.c (1.15) (+3 -1)
 		src/foomatic/printers.c (1.3) (+3 -1)
+		src/foomatic/stp_limits.c (1.3) (+1 -0)
 
 	Use stp_init() correctly, so that the dynamic printer list exists when
 	we try to use it.
@@ -11724,11 +14804,39 @@
 
 2002-11-18	<rleigh@sourceforge.net>
 
-	Files:	src/main/print-escp2.h (1.21) (+11 -1)
-		src/main/util.h (1.1) ( )
+	Files:	src/main/dither-matrices.h (1.1) (added)
+		src/main/dither.h (1.1) (added)
+		src/main/gimp-print-internal.h (1.59) (+15 -499)
+		src/main/list.h (1.2) (+13 -1)
+		src/main/papers.h (1.1) (added)
+		src/main/print-escp2.h (1.21) (+11 -1)
+		src/main/printers.h (1.1) (added)
+		src/main/quickmatrix257.h (1.3) (+11 -1)
+		src/main/ran.367.179.h (1.3) (+11 -1)
+		src/main/ran.509.131.h (1.3) (+11 -1)
+		src/main/util.h (1.1) (added)
+		src/main/vars.h (1.3) (+26 -1)
+		src/main/weave.h (1.1) (added)
 
 	split gimp-print-internal.h into separate header files (one per .c file)
 
+2002-11-17	<rleigh@sourceforge.net>
+
+	Files:	debian/gimp1.2-print.files (1.1) (added)
+
+	Don't special case the print plugin build and install
+
+2002-11-17	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.50) (+8 -0)
+		debian/cupsys-driver-gimpprint.files (1.7) (+3 -1)
+		debian/rules (1.41) (+2 -5)
+
+	Make the debian package build again:
+	Remove the special-cased print plugin build and install, since it's
+	now not needed.
+	Add cups-genppdconfig to cupsys-driver-gimpprint
+
 2002-11-17	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.65) (+131 -49)
@@ -11758,16 +14866,35 @@
 
 2002-11-17	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.38) (+2 -2)
+	Files:	debian/control.in (1.30) (+2 -2)
+
+	Update Standards-Version
+
+2002-11-17	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.18) (+31 -24)
+		src/main/Makefile.am (1.38) (+2 -2)
 
 	Fix list function prototypes and header name
 
 2002-11-16	<rlk@sourceforge.net>
 
-	Files:	src/main/string-list.c (1.1) ( )
+	Files:	src/main/string-list.c (1.1) (added)
 
 	file string-list.c was initially added on branch parameter-reorg-20021109-branch.
 
+2002-11-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/gimp-print-cups.h (1.1) (added)
+
+	file gimp-print-cups.h was initially added on branch parameter-reorg-20021109-branch.
+
+2002-11-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/gimp-print-cups.c (1.1) (added)
+
+	file gimp-print-cups.c was initially added on branch parameter-reorg-20021109-branch.
+
 2002-11-16	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.62) (+7 -1)
@@ -11776,14 +14903,48 @@
 	Increased density for Laserjets to 1.0 and ensure that density does
 	not exceed 1.0 in the driver.
 
+2002-11-16	<rleigh@sourceforge.net>
+
+	Files:	doc/developer/functions.texi (1.5) (+185 -2)
+
+	Document the new stp_list_t list type
+
+2002-11-14	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-ijs/Brightness.xml (1.3) (+2 -2)
+		src/foomatic/foomatic-templates-ijs/Gamma.xml (1.3) (+2 -2)
+		src/foomatic/foomatic-templates-ijs/Saturation.xml (1.3) (+2 -2)
+
+	Renamed Foomatic options from "Stp..." to "stp...", so that they have the same names as the appropriate options of the native CUPS drivers.
+
 2002-11-13	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.37) (+3 -1)
-		src/main/print-list.c (1.1) ( )
+	Files:	include/gimp-print/gimp-print.h.in (1.17) (+36 -2)
+		src/main/Makefile.am (1.37) (+3 -1)
+		src/main/list.h (1.1) (added)
+		src/main/print-list.c (1.1) (added)
 
 	Add a doubly-linked list implementation, with optional callbacks to
 	free nodes, sort nodes and find nodes by name and/or long name.
 
+2002-11-11	<rleigh@sourceforge.net>
+
+	Files:	man/gimpprint.3.in (1.4) (+10 -0)
+
+	Add SEE ALSO references to the libgimpprint man pages
+
+2002-11-09	<rleigh@sourceforge.net>
+
+	Files:	man/gimpprint-imagetypes.7.in (1.2) (+2 -2)
+
+	Fix a typo
+
+2002-11-09	<cpbs@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.87) (+5 -5)
+
+	Handle resizing of the "Setup Printer" window a little more usefully.
+
 2002-11-07	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.49) (+3 -3)
@@ -11796,13 +14957,32 @@
 
 	633910 Epson 1520 ppd bug gimp-print 4.2.3
 
+2002-11-06	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.32) (+3 -2)
+		src/gimp/gimp_main_window.c (1.86) (+167 -133)
+
+	More UI cleanup
+
 2002-11-05	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.47) (+39 -49)
+	Files:	src/gimp/gimp_color_window.c (1.31) (+2 -2)
+		src/gimp/gimp_main_window.c (1.85) (+12 -12)
+
+	No need to use explicit number of table columns/rows
+
+2002-11-05	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.16) (+19 -5)
+		src/cups/genppd.c (1.47) (+39 -49)
 		src/cups/rastertoprinter.c (1.29) (+14 -13)
 		src/foomatic/printer_options.c (1.14) (+15 -17)
+		src/gimp/gimp_color_window.c (1.30) (+5 -16)
+		src/gimp/gimp_main_window.c (1.84) (+33 -59)
 		src/gimp/print_gimp.h (1.30) (+2 -3)
+		src/main/gimp-print-internal.h (1.58) (+5 -6)
 		src/main/print-canon.c (1.83) (+31 -79)
+		src/main/print-dither.c (1.101) (+5 -18)
 		src/main/print-escp2.c (1.193) (+19 -70)
 		src/main/print-lexmark.c (1.82) (+17 -69)
 		src/main/print-pcl.c (1.61) (+35 -95)
@@ -11815,7 +14995,14 @@
 
 2002-11-04	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.33) (+6 -10)
+	Files:	src/gimp/gimp_main_window.c (1.83) (+116 -121)
+
+	Minor code reorganization
+
+2002-11-04	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.82) (+111 -142)
+		src/gimp/print.c (1.33) (+6 -10)
 		src/gimp/print_gimp.h (1.29) (+5 -3)
 
 	Clean up the UI a bit more.
@@ -11834,12 +15021,47 @@
 
 2002-11-03	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.46) (+16 -8)
+	Files:	include/gimp-print/gimp-print.h.in (1.15) (+2 -3)
+
+	Remove stray stp_set_orientation.
+
+2002-11-03	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.14) (+41 -27)
+		man/ijsgimpprint.1.in (1.4) (+2 -2)
+		src/cups/genppd.c (1.46) (+16 -8)
 		src/cups/rastertoprinter.c (1.28) (+24 -16)
 		src/foomatic/foomatic-generator.in (1.26) (+1 -1)
+		src/foomatic/foomatic-templates-gs/Brightness.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Color.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Contrast.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Cyan.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Density.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Dither.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Gamma.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/ImageType.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/InkType.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/InputSlot.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Magenta.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/MediaType.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Model.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/PageSize.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Quality.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Resolution.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Saturation.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/Yellow.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-gs/gimp-print.xml (1.4) (removed)
+		src/foomatic/foomatic-templates-ijs/Dither.xml (1.3) (removed)
+		src/foomatic/foomatic-templates-ijs/DitherAlgorithm.xml (1.2) (+20 -0)
 		src/foomatic/printer_options.c (1.13) (+12 -27)
+		src/ghost/README (1.83) (+2 -2)
+		src/ghost/ijsgimpprint.c (1.21) (+13 -43)
+		src/gimp/gimp_color_window.c (1.29) (+16 -20)
+		src/gimp/gimp_main_window.c (1.81) (+17 -16)
 		src/gimp/print.c (1.32) (+63 -46)
+		src/main/gimp-print-internal.h (1.57) (+5 -2)
 		src/main/print-canon.c (1.82) (+10 -6)
+		src/main/print-dither.c (1.100) (+21 -14)
 		src/main/print-escp2.c (1.192) (+97 -89)
 		src/main/print-lexmark.c (1.81) (+10 -6)
 		src/main/print-papers.c (1.5) (+2 -2)
@@ -11863,35 +15085,145 @@
 
 	Remove the last vestiges of the stp driver from the foomatic data.
 
+2002-11-03	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-ijs/DitherAlgorithm.xml (1.1) (added)
+
+	file DitherAlgorithm.xml was initially added on branch parameter-reorg-20021102-branch.
+
 2002-11-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.31) (+14 -15)
+	Files:	src/gimp/gimp_main_window.c (1.80) (+3 -7)
+
+	A bit more code factoring.
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.79) (+7 -38)
+
+	Sometimes simpler is better...
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.78) (+45 -36)
+
+	Don't update the preview unnecessarily.
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.28) (+3 -3)
+		src/gimp/gimp_main_window.c (1.77) (+87 -66)
+		src/gimp/print.c (1.31) (+14 -15)
 		src/gimp/print_gimp.h (1.28) (+7 -9)
 
 	Fix new printer, and clean up some other stuff
 
 2002-11-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.30) (+6 -45)
+	Files:	src/gimp/gimp_color_window.c (1.27) (+3 -13)
+		src/gimp/gimp_main_window.c (1.76) (+6 -14)
+		src/gimp/print.c (1.30) (+6 -45)
 
 	Use g_strdup rather than local hack c_strdup
 
 2002-11-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.26) (+8 -3)
-		src/gimp/print_gimp.h (1.27) (+1 -14)
+	Files:	src/gimp/gimp_color_window.c (1.26) (+3 -3)
+
+	Attach the dither algorithm box in the right place
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/print_gimp.h (1.27) (+1 -14)
+
+	Some more cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.25) (+17 -19)
+		src/gimp/gimp_main_window.c (1.75) (+98 -125)
+		src/gimp/print_gimp.h (1.26) (+8 -3)
 
 	Some more cleanup
 
 2002-11-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.25) (+3 -2)
+	Files:	src/gimp/gimp_main_window.c (1.74) (+85 -103)
+
+	A bit more cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.73) (+80 -120)
+
+	Some more cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.72) (+24 -39)
+
+	A bit more
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.71) (+20 -41)
+
+	A bit more cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.70) (+21 -32)
+
+	A bit more cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.69) (+33 -86)
+
+	More cleanup
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.68) (+20 -33)
+
+	More cleanup of the GUI
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.24) (+3 -1)
+
+	Add EvenTone
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.23) (+98 -305)
+
+	Generalize the color adjustments
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.67) (+2 -2)
+
+	Minor
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.66) (+62 -102)
+
+	Generalize the units.
+
+2002-11-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.22) (+3 -2)
+		src/gimp/gimp_main_window.c (1.65) (+181 -387)
+		src/gimp/print_gimp.h (1.25) (+3 -2)
 
 	generalize the combo boxes
 
 2002-11-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.29) (+2 -6)
+	Files:	src/gimp/gimp_main_window.c (1.64) (+5 -1)
+		src/gimp/print.c (1.29) (+2 -6)
 		src/gimp/print_gimp.h (1.24) (+1 -3)
 
 	Tighten up some static declarations
@@ -11906,11 +15238,18 @@
 
 	Files:	NEWS (1.82) (+44 -8)
 		README (1.109) (+2 -1)
+		src/ghost/README (1.82) (+3 -1)
 
 	Prep for 4.3.6
 
 2002-11-01	<rlk@sourceforge.net>
 
+	Files:	src/printdef/printdefy.y (1.10) (+2 -2)
+
+	The printer list can be static
+
+2002-11-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.75) (+1 -205)
 		src/main/print-vars.c (1.5) (+13 -1)
 		src/main/printers.c (1.5) (+192 -1)
@@ -11925,11 +15264,21 @@
 
 2002-11-01	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.45) (+20 -21)
+	Files:	include/gimp-print/gimp-print.h.in (1.13) (+129 -138)
+
+	Cosmetic cleanup
+
+2002-11-01	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.12) (+118 -131)
+		src/cups/genppd.c (1.45) (+20 -21)
 		src/cups/rastertoprinter.c (1.27) (+8 -15)
 		src/foomatic/foomatic-generator.in (1.25) (+3 -9)
 		src/foomatic/printer_options.c (1.11) (+18 -5)
+		src/ghost/ijsgimpprint.c (1.20) (+17 -24)
+		src/gimp/gimp_main_window.c (1.63) (+25 -32)
 		src/gimp/print.c (1.28) (+3 -7)
+		src/main/gimp-print-internal.h (1.56) (+26 -2)
 		src/main/print-canon.c (1.80) (+35 -29)
 		src/main/print-escp2.c (1.191) (+25 -23)
 		src/main/print-lexmark.c (1.80) (+29 -24)
@@ -11965,19 +15314,61 @@
 
 2002-10-30	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.62) (+10 -9)
+
+	Parameterize the minimum image size
+
+2002-10-30	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.61) (+11 -13)
+
+	Lock the mouse to the preview motion; don't slip and slide slightly
+	over time due to round off error.
+
+2002-10-30	<rlk@sourceforge.net>
+
 	Files:	test/unprint.c (1.28) (+26 -2)
 
 	Color mask to selectively unprint channels
 
 2002-10-29	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.60) (+40 -69)
+
+	Back out 1.59; that did slow things down a lot in some cases.
+
+	Fix entry boxes.
+
+2002-10-29	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.99) (+127 -266)
+
+	Optimized eventone dither somewhat. Result is a slightly different
+	algorithm, but hopefully of the same quality.
+
+2002-10-29	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.59) (+45 -34)
+
+	Eliminate flashing in the preview (experimental!)
+
+2002-10-29	<rlk@sourceforge.net>
+
 	Files:	src/gimp/print.c (1.27) (+3 -3)
 
 	gimp_writefunc should be static
 
 2002-10-29	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.23) (+6 -1)
+	Files:	src/gimp/gimp_main_window.c (1.58) (+38 -4)
+
+	Eliminate unsightly jiggling of the preview when it's resized in some
+	cases.
+
+2002-10-29	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.57) (+171 -153)
+		src/gimp/print_gimp.h (1.23) (+6 -1)
 
 	Partially generalize units; support points and mm in addition to
 	inches and cm.
@@ -11998,18 +15389,38 @@
 		man/cups-genppd.8.in (1.2) (+2 -2)
 		man/cups-genppdconfig.8.in (1.2) (+2 -2)
 		man/escputil.1.in (1.8) (+2 -2)
+		man/gimpprint-color.7.in (1.1) (added)
+		man/gimpprint-config.1.in (1.5) (+9 -9)
+		man/gimpprint-dithers.7.in (1.1) (added)
+		man/gimpprint-imagetypes.7.in (1.1) (added)
+		man/gimpprint-inktypes.7.in (1.1) (added)
+		man/gimpprint-mediasizes.7.in (1.1) (added)
+		man/gimpprint-mediasources.7.in (1.1) (added)
+		man/gimpprint-mediatypes.7.in (1.1) (added)
+		man/gimpprint-models.7.in (1.1) (added)
+		man/gimpprint-resolutions.7.in (1.1) (added)
+		man/gimpprint.3.in (1.3) (+4 -4)
+		man/ijsgimpprint.1.in (1.3) (+36 -1051)
 
 	Split ijsgimpprint(1) into separate manpages, to document libgimpprint
 
 2002-10-28	<rleigh@sourceforge.net>
 
+	Files:	doc/developer/functions.texi (1.4) (+54 -21)
+
+	Document papersize functions
+
+2002-10-28	<rleigh@sourceforge.net>
+
 	Files:	doc/README.maintaining (1.14) (+439 -361)
 
 	Add autotools version and compatibility information
 
 2002-10-28	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.26) (+3 -3)
+	Files:	src/gimp/gimp_color_window.c (1.21) (+71 -74)
+		src/gimp/gimp_main_window.c (1.56) (+318 -327)
+		src/gimp/print.c (1.26) (+3 -3)
 		src/gimp/print_gimp.h (1.22) (+21 -21)
 
 	Remove "gimp_" prefix from internal functions.  This was a holdover from
@@ -12023,8 +15434,10 @@
 
 2002-10-28	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.79) (+6 -4)
+	Files:	src/main/gimp-print-internal.h (1.55) (+21 -10)
+		src/main/print-canon.c (1.79) (+6 -4)
 		src/main/print-color.c (1.31) (+3 -1)
+		src/main/print-dither.c (1.98) (+7 -1)
 		src/main/print-papers.c (1.4) (+3 -1)
 		src/main/print-pcl.c (1.58) (+2 -2)
 		src/main/print-ps.c (1.31) (+3 -1)
@@ -12045,6 +15458,13 @@
 	Corrected error according Bugs item #628698 (exchanged colors).
 	Corrected also the photo mode.
 
+2002-10-27	<rwisi@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.97) (+2 -2)
+
+	Correction related to Bugs item #628698.
+	Corrected problem in stp_dither_set_light_ink().
+
 2002-10-27	<rlk@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.30) (+2 -1)
@@ -12061,6 +15481,18 @@
 
 2002-10-27	<rlk@sourceforge.net>
 
+	Files:	doc/developer/functions.texi (1.3) (+1 -1)
+
+	Minor syntax warning
+
+2002-10-27	<rlk@sourceforge.net>
+
+	Files:	src/printdef/printdefy.y (1.9) (+6 -1)
+
+	Syntax cleanup
+
+2002-10-27	<rlk@sourceforge.net>
+
 	Files:	src/main/Makefile.am (1.36) (+3 -2)
 
 	Minor fix.
@@ -12071,18 +15503,29 @@
 		NEWS (1.81) (+0 -2)
 		README (1.108) (+32 -85)
 		configure.ac (1.28) (+11 -20)
+		debian/README.Debian (1.30) (+2 -2)
+		include/gimp-print/gimp-print.h.in (1.11) (+9 -48)
 		man/Makefile.am (1.13) (+4 -4)
 		scripts/autogen.sh (1.21) (+10 -0)
 		src/cups/genppd.c (1.44) (+5 -5)
 		src/cups/rastertoprinter.c (1.26) (+5 -59)
 		src/foomatic/Makefile.am (1.30) (+3 -14)
 		src/foomatic/foomatic-generator.in (1.24) (+20 -73)
+		src/ghost/COPYING (1.2) (removed)
 		src/ghost/Makefile.am (1.27) (+3 -7)
+		src/ghost/README (1.81) (+82 -259)
+		src/ghost/contrib.mak.addon.in (1.2) (removed)
+		src/ghost/gdevstp.c (1.16) (removed)
+		src/ghost/ijsgimpprint.c (1.19) (+13 -16)
+		src/gimp/gimp_color_window.c (1.20) (+37 -35)
+		src/gimp/gimp_main_window.c (1.55) (+347 -349)
 		src/gimp/print-image-gimp.c (1.6) (+9 -24)
 		src/gimp/print.c (1.25) (+357 -138)
 		src/gimp/print_gimp.h (1.21) (+36 -4)
 		src/main/Makefile.am (1.35) (+9 -6)
+		src/main/gimp-print-internal.h (1.54) (+16 -2)
 		src/main/print-canon.c (1.78) (+34 -43)
+		src/main/print-dither.c (1.96) (+162 -465)
 		src/main/print-escp2-data.c (1.67) (+4 -1)
 		src/main/print-escp2.c (1.189) (+99 -86)
 		src/main/print-escp2.h (1.19) (+2 -1)
@@ -12093,6 +15536,9 @@
 		src/main/print-util.c (1.73) (+36 -1231)
 		src/main/print-vars.c (1.2) (+440 -0)
 		src/main/printers.c (1.2) (+84 -0)
+		src/main/vars.h (1.2) (+73 -0)
+		src/printdef/printdef.h (1.6) (+5 -7)
+		src/printdef/printdefy.y (1.8) (+71 -9)
 		src/testpattern/testpattern.c (1.12) (+13 -28)
 		test/unprint.c (1.26) (+3 -3)
 
@@ -12110,22 +15556,41 @@
 
 2002-10-21	<rlk@sourceforge.net>
 
-	Files:	src/main/printers.c (1.1) ( )
+	Files:	src/main/vars.h (1.1) (added)
+
+	file vars.h was initially added on branch reorg-20021020-branch.
+
+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.
 
 2002-10-21	<rlk@sourceforge.net>
 
-	Files:	src/main/print-vars.c (1.1) ( )
+	Files:	src/main/printer.h (1.1) (added)
+
+	file printer.h was initially added on branch reorg-20021020-branch.
+
+2002-10-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-vars.c (1.1) (added)
 
 	file print-vars.c was initially added on branch reorg-20021020-branch.
 
 2002-10-21	<rlk@sourceforge.net>
 
-	Files:	src/main/print-papers.c (1.1) ( )
+	Files:	src/main/print-papers.c (1.1) (added)
 
 	file print-papers.c was initially added on branch reorg-20021020-branch.
 
+2002-10-19	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/gimp-print.xml (1.3) (+1 -1)
+		src/foomatic/foomatic-templates-ijs/gimp-print.xml (1.3) (+1 -1)
+
+	Security fix: s/-dSAFER/-dPARANOIDSAFER/ for the GhostScript command lines.
+
 2002-10-19	<tylerb@sourceforge.net>
 
 	Files:	NEWS (1.80) (+2 -1)
@@ -12148,6 +15613,7 @@
 		po/fr.po (1.30) (+488 -396)
 		po/ja.po (1.3) (+137 -129)
 		po/nl.po (1.10) (+1103 -1201)
+		po/no.po (1.30) (+819 -341)
 		po/pl.po (1.14) (+1107 -787)
 		po/pt.po (1.8) (+842 -685)
 		po/sk.po (1.13) (+869 -653)
@@ -12177,6 +15643,7 @@
 		po/fr.po (1.29) (+1026 -916)
 		po/ja.po (1.2) (+3326 -0)
 		po/nl.po (1.9) (+1380 -1181)
+		po/no.po (1.29) (+598 -1074)
 		po/pl.po (1.13) (+810 -1160)
 		po/pt.po (1.7) (+664 -932)
 		po/sk.po (1.12) (+676 -945)
@@ -12217,6 +15684,12 @@
 
 2002-10-12	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.95) (+206 -322)
+
+	Handle black printing as a special case of raw.
+
+2002-10-12	<rlk@sourceforge.net>
+
 	Files:	src/testpattern/testpattern.c (1.10) (+13 -1)
 
 	Handle a few more cases in extended mode.
@@ -12255,9 +15728,18 @@
 
 2002-10-09	<rleigh@sourceforge.net>
 
+	Files:	debian/ijsgimpprint.files (1.2) (+2 -0)
+
+	Add ijsgimpprint file list
+
+2002-10-09	<rleigh@sourceforge.net>
+
 	Files:	Makefile.am (1.131) (+2 -1)
 		configure.ac (1.26) (+3 -2)
 		man/Makefile.am (1.12) (+7 -2)
+		man/ijsgimpprint.1 (1.1) (added)
+		man/ijsgimpprint.1 (1.2) (removed)
+		man/ijsgimpprint.1.in (1.2) (+1332 -0)
 
 	Add ijsgimpprint.1.in manual page
 
@@ -12271,9 +15753,45 @@
 
 	Update .cvsignore
 
+2002-10-09	<rleigh@sourceforge.net>
+
+	Files:	debian/.cvsignore (1.7) (+2 -2)
+		debian/README.Debian (1.29) (+4 -1)
+		debian/README.building (1.4) (+4 -3)
+		debian/changelog (1.49) (+8 -0)
+		debian/control.in (1.29) (+34 -13)
+		debian/rules (1.40) (+5 -5)
+
+	Add ijsgimpprint package
+	Miscellaneous other small updates
+
+2002-10-09	<rleigh@sourceforge.net>
+
+	Files:	debian/ijsgimpprint.files (1.1) (added)
+
+	file ijsgimpprint.files was initially added on branch gimp-print-4_2_branch.
+
+2002-10-09	<rleigh@sourceforge.net>
+
+	Files:	man/ijsgimpprint.1.in (1.1) (added)
+
+	file ijsgimpprint.1.in was initially added on branch gimp-print-4_2_branch.
+
+2002-10-08	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.18) (+33 -2)
+
+	620016 IJS driver does not print properly in monochrome
+
+2002-10-07	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.17) (+2 -2)
+
+	619992 IJS driver prints spurious first line
+
 2002-10-07	<rlk@sourceforge.net>
 
-	Files:	po/ja.po (1.1) ( )
+	Files:	po/ja.po (1.1) (added)
 
 	file ja.po was initially added on branch gimp-print-4_2_branch.
 
@@ -12293,6 +15811,7 @@
 		po/es.po (1.6) (+318 -293)
 		po/fr.po (1.28) (+318 -293)
 		po/nl.po (1.8) (+318 -293)
+		po/no.po (1.28) (+321 -296)
 		po/pl.po (1.12) (+318 -293)
 		po/pt.po (1.6) (+318 -293)
 		po/sk.po (1.11) (+318 -293)
@@ -12302,6 +15821,18 @@
 
 2002-10-03	<rlk@sourceforge.net>
 
+	Files:	debian/Makefile.am (1.3) (+2 -3)
+
+	Remove another missing file.
+
+2002-10-03	<rlk@sourceforge.net>
+
+	Files:	debian/Makefile.am (1.2) (+1 -2)
+
+	Remove file that isn't in the repository.
+
+2002-10-03	<rlk@sourceforge.net>
+
 	Files:	configure.ac (1.25) (+3 -2)
 
 	One more file to be created
@@ -12310,6 +15841,7 @@
 
 	Files:	NEWS (1.78) (+234 -99)
 		README (1.107) (+25 -127)
+		src/ghost/README (1.80) (+7 -186)
 
 	Gimp-Print 4.3.5 release
 
@@ -12321,7 +15853,8 @@
 
 2002-09-30	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.186) (+88 -11)
+	Files:	src/main/gimp-print-internal.h (1.53) (+4 -2)
+		src/main/print-escp2.c (1.186) (+88 -11)
 		src/main/print-util.c (1.71) (+6 -6)
 
 	Optional debugging information in ESCP2 print files
@@ -12345,12 +15878,16 @@
 		NEWS (1.77) (+1 -1)
 		README (1.105) (+39 -46)
 		README (1.106) (+1 -1)
+		debian/README.Debian (1.28) (+1 -1)
+		src/ghost/README (1.79) (+43 -5)
 
 	Prep for 4.3.5
 
 2002-09-25	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.77) (+2 -7)
+	Files:	src/main/gimp-print-internal.h (1.52) (+3 -4)
+		src/main/print-canon.c (1.77) (+2 -7)
+		src/main/print-dither.c (1.94) (+39 -42)
 		src/main/print-escp2.c (1.184) (+102 -148)
 		src/main/print-lexmark.c (1.77) (+2 -7)
 		src/main/print-pcl.c (1.56) (+2 -7)
@@ -12404,7 +15941,8 @@
 
 	Files:	Makefile.am (1.130) (+64 -16)
 		configure.ac (1.24) (+15 -37)
-		scripts/Makefile.am (1.1) ( )
+		debian/Makefile.am (1.1) (added)
+		scripts/Makefile.am (1.1) (added)
 		src/foomatic/Makefile.am (1.29) (+15 -5)
 		src/testpattern/Makefile.am (1.10) (+7 -6)
 
@@ -12416,13 +15954,15 @@
 
 2002-09-21	<rleigh@sourceforge.net>
 
-	Files:	po/Makevars (1.1) ( )
+	Files:	po/Makevars (1.1) (added)
 
 	po/Makevars is needed by gettext 0.11.x
 
 2002-09-21	<rleigh@sourceforge.net>
 
-	Files:	src/main/print-util.c (1.69) (+11 -1)
+	Files:	doc/developer/functions.texi (1.2) (+35 -0)
+		include/gimp-print/gimp-print.h.in (1.10) (+7 -2)
+		src/main/print-util.c (1.69) (+11 -1)
 
 	New function stp_set_output_codeset for setting the charset encoding of output text strings
 
@@ -12430,10 +15970,10 @@
 
 	Files:	configure.ac (1.23) (+19 -6)
 		man/Makefile.am (1.11) (+20 -4)
-		man/cups-genppdconfig.8.in (1.1) ( )
+		man/cups-genppdconfig.8.in (1.1) (added)
 		src/cups/Makefile.am (1.58) (+25 -35)
 		src/cups/cups-calibrate.c (1.3) (+4 -1)
-		src/cups/cups-genppdconfig.in (1.1) ( )
+		src/cups/cups-genppdconfig.in (1.1) (added)
 
 	Add a new program, cupsgenppdconfig, to interatively generate PPDs
 	Clean up cups-calibrate includes
@@ -12489,7 +16029,7 @@
 
 	Files:	configure.ac (1.20) (+3 -2)
 		src/foomatic/Makefile.am (1.28) (+2 -2)
-		src/foomatic/mk_printerlist.in (1.1) ( )
+		src/foomatic/mk_printerlist.in (1.1) (added)
 
 	Add new mk_printerlist program to generate verbose list of supported printers
 
@@ -12551,6 +16091,8 @@
 
 	Files:	man/cups-calibrate.8.in (1.3) (+26 -32)
 		man/escputil.1.in (1.7) (+43 -58)
+		man/gimpprint-config.1.in (1.4) (+38 -33)
+		man/gimpprint.3.in (1.2) (+13 -21)
 
 	Unify formatting of manual pages
 	Correct my email address
@@ -12566,8 +16108,9 @@
 2002-08-27	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.19) (+3 -2)
+		debian/cupsys-driver-gimpprint.files (1.6) (+2 -0)
 		man/Makefile.am (1.9) (+3 -3)
-		man/cups-genppd.8.in (1.1) ( )
+		man/cups-genppd.8.in (1.1) (added)
 		src/cups/Makefile.am (1.57) (+11 -14)
 		src/cups/genppd.c (1.40) (+368 -68)
 
@@ -12622,6 +16165,7 @@
 		po/es.po (1.4) (+699 -374)
 		po/fr.po (1.27) (+727 -274)
 		po/nl.po (1.6) (+713 -306)
+		po/no.po (1.27) (+659 -193)
 		po/pl.po (1.11) (+693 -219)
 		po/pt.po (1.5) (+699 -374)
 		po/sk.po (1.9) (+699 -371)
@@ -12633,6 +16177,8 @@
 
 	Files:	NEWS (1.75) (+18 -4)
 		README (1.102) (+1 -1)
+		debian/README.Debian (1.27) (+1 -1)
+		src/ghost/README (1.78) (+107 -62)
 
 	Prep for Gimp-Print 4.3.4
 
@@ -12652,12 +16198,17 @@
 
 	Files:	NEWS (1.74) (+15 -1)
 		configure.ac (1.18) (+30 -16)
+		doc/developer/escp2.texi (1.2) (+106 -31)
+		include/gimp-print/gimp-print.h.in (1.9) (+3 -2)
 		po/POTFILES.in (1.13) (+1 -0)
 		src/cups/Makefile.am (1.56) (+2 -1)
 		src/escputil/escputil.c (1.44) (+17 -1)
 		src/foomatic/foomatic-printermap (1.38) (+9 -0)
+		src/ghost/README (1.77) (+9 -0)
+		src/main/gimp-print-internal.h (1.51) (+3 -3)
 		src/main/print-canon.c (1.76) (+5 -3)
 		src/main/print-color.c (1.29) (+45 -1)
+		src/main/print-dither.c (1.93) (+260 -48)
 		src/main/print-escp2-data.c (1.52) (+764 -201)
 		src/main/print-escp2.c (1.181) (+100 -28)
 		src/main/print-escp2.h (1.18) (+14 -4)
@@ -12690,12 +16241,40 @@
 	*)flush_pass: check lineactive with >0
 	*)corrected head offset
 
+2002-08-08	<tillkamppeter@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.16) (+46 -7)
+
+	Re-applied patch for switching the locale to "C" during communication with IJS client.
+
 2002-08-07	<rlk@sourceforge.net>
 
 	Files:	src/gimp/Makefile.am (1.23) (+3 -6)
 
 	586960 Gimp Print plugin installs incorrectly on some systems
 
+2002-08-07	<tillkamppeter@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.15) (+3 -27)
+
+	Removed last change, the problem is most probably a bug in IJS.
+
+2002-08-06	<tillkamppeter@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.14) (+27 -3)
+
+	Made the IJS interface of GIMP-Print also working with non-english locales.
+
+2002-08-01	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.48) (+15 -0)
+		debian/libgimpprint-doc.doc-base (1.2) (removed)
+		debian/libgimpprint-doc.doc-base.in (1.1) (added)
+		debian/rules (1.39) (+14 -7)
+
+	Make libgimpprint-doc a virtual package
+	Generate libgimpprint-doc.doc-base to cope with package naming changes
+
 2002-07-26	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.51) (+18 -7)
@@ -12716,13 +16295,14 @@
 
 2002-07-21	<rlk@sourceforge.net>
 
-	Files:	src/testpattern/extended.sample (1.1) ( )
+	Files:	src/testpattern/extended.sample (1.1) (added)
 
 	file extended.sample was initially added on branch generic_color_branch.
 
 2002-07-21	<rlk@sourceforge.net>
 
 	Files:	man/escputil.1.in (1.6) (+1 -2)
+		man/gimpprint-config.1.in (1.3) (+1 -2)
 
 	Remove spurious directive (from Eric Raymond)
 
@@ -12760,6 +16340,7 @@
 2002-07-20	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.37) (+1 -0)
+		src/ghost/README (1.76) (+1 -0)
 		src/main/print-escp2.c (1.177) (+134 -126)
 		src/main/printers.xml (1.50) (+9 -1)
 
@@ -12782,6 +16363,16 @@
 
 2002-07-20	<rlk@sourceforge.net>
 
+	Files:	src/ghost/ijsgimpprint.c (1.13) (+22 -15)
+
+	Remove some non-ANSI constructs, confusing comments, and unnecessary
+	preprocessor definitions.
+
+	Accept Duplex, PS:Duplex, Tumble, and PS:Tumble for compatibility with
+	Ghostscript IJS driver.
+
+2002-07-20	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.47) (+338 -353)
 		src/main/print-escp2.c (1.176) (+61 -95)
 		src/main/print-escp2.h (1.17) (+50 -66)
@@ -12802,6 +16393,7 @@
 2002-07-17	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.36) (+1 -0)
+		src/ghost/README (1.75) (+1 -0)
 		src/main/print-escp2-data.c (1.45) (+17 -1)
 		src/main/printers.xml (1.48) (+11 -1)
 
@@ -12830,6 +16422,7 @@
 	Files:	NEWS (1.73) (+24 -1)
 		README (1.101) (+1 -1)
 		configure.ac (1.16) (+3 -3)
+		debian/README.Debian (1.26) (+1 -1)
 		po/da.po (1.19) (+2 -2)
 		po/de.po (1.4) (+2 -2)
 		po/el.po (1.5) (+2 -2)
@@ -12837,6 +16430,7 @@
 		po/es.po (1.3) (+2 -2)
 		po/fr.po (1.26) (+2 -2)
 		po/nl.po (1.5) (+2 -2)
+		po/no.po (1.26) (+2 -2)
 		po/pl.po (1.10) (+2 -2)
 		po/pt.po (1.4) (+2 -2)
 		po/sk.po (1.8) (+2 -2)
@@ -12846,6 +16440,12 @@
 
 2002-07-14	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.74) (+5 -7)
+
+	Support quadtone printing.
+
+2002-07-14	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.42) (+3 -3)
 
 	Don't call it Piezography (TM) quadtone just yet, as it hasn't been
@@ -12857,6 +16457,12 @@
 
 	Handle extra black nozzles correctly at low resolutions.
 
+2002-07-13	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.92) (+20 -20)
+
+	Use typedef rather than #define
+
 2002-07-12	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.174) (+2 -2)
@@ -12865,7 +16471,8 @@
 
 2002-07-08	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2-data.c (1.41) (+251 -251)
+	Files:	src/main/gimp-print-internal.h (1.50) (+6 -11)
+		src/main/print-escp2-data.c (1.41) (+251 -251)
 		src/main/print-escp2.c (1.173) (+12 -16)
 		src/main/print-escp2.h (1.16) (+7 -12)
 		src/main/print-lexmark.c (1.73) (+3 -3)
@@ -12874,6 +16481,12 @@
 
 	Cleanup
 
+2002-07-08	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.91) (+10 -6)
+
+	Fixed EvenTone's handling of photo inks for non-CMYK modes.
+
 2002-07-07	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.40) (+31 -36)
@@ -12882,6 +16495,13 @@
 
 2002-07-07	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.90) (+39 -37)
+
+	Make sure we don't use error diffusion in a transition range with
+	adaptive hybrid dithering.
+
+2002-07-07	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.39) (+25 -23)
 
 	Parameterize the ink transition density for the Piezography inks.
@@ -12988,6 +16608,7 @@
 		po/es.po (1.2) (+617 -690)
 		po/fr.po (1.25) (+199 -223)
 		po/nl.po (1.4) (+183 -222)
+		po/no.po (1.25) (+179 -222)
 		po/pl.po (1.9) (+183 -222)
 		po/pt.po (1.3) (+600 -682)
 		po/sk.po (1.7) (+610 -694)
@@ -13001,6 +16622,7 @@
 		NEWS (1.72) (+9 -1)
 		README (1.100) (+121 -64)
 		configure.ac (1.15) (+3 -3)
+		debian/README.Debian (1.25) (+1 -1)
 
 	Prep for 4.3.2
 
@@ -13010,10 +16632,18 @@
 
 	Minor typo
 
+2002-06-29	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.89) (+9 -3)
+
+	Fixed Eventone's handling of raw CMYK channels.
+
 2002-06-28	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.71) (+92 -45)
 		README (1.99) (+3 -3)
+		debian/README.Debian (1.24) (+2 -2)
+		src/ghost/README (1.73) (+9 -8)
 
 	Prep for 4.3.1
 
@@ -13023,6 +16653,18 @@
 
 	Year updates
 
+2002-06-28	<rlk@sourceforge.net>
+
+	Files:	m4/stp_libconfig.m4 (1.2) (+10 -11)
+
+	Fix portability issue
+
+2002-06-21	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.88) (+20 -7)
+
+	Force Eventone to use less photo ink. Also make transition more gradual.
+
 2002-06-21	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.30) (+2 -2)
@@ -13085,6 +16727,12 @@
 
 2002-06-18	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.72) (+5 -0)
+
+	Add Epson 950, 2100, 2200, 7600, and 9600.
+
+2002-06-18	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.24) (+429 -408)
 		src/main/print-escp2.c (1.165) (+69 -81)
 		src/main/print-escp2.h (1.12) (+26 -24)
@@ -13175,7 +16823,8 @@
 
 2002-06-09	<rlk@sourceforge.net>
 
-	Files:	man/Makefile.am (1.8) (+1 -3)
+	Files:	include/gimp-print/Makefile.am (1.4) (+1 -3)
+		man/Makefile.am (1.8) (+1 -3)
 
 	Remove BUILD_LIBGIMPPRINT
 
@@ -13227,6 +16876,12 @@
 
 	Also, fix a minor printf-related problem.
 
+2002-06-04	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.87) (+1 -2)
+
+	Bring eventone raw cmyk into line with standard algorithm.
+
 2002-06-04	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.13) (+3 -3)
@@ -13237,12 +16892,30 @@
 
 2002-06-01	<rlk@sourceforge.net>
 
-	Files:	po/de.po (1.1) ( )
+	Files:	src/ghost/ijsgimpprint.c (1.12) (+4 -2)
+
+	ijs_server_get_page_header => 1 is not an error.
+
+2002-06-01	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.11) (+14 -11)
+
+	Don't die on really huge images.
+
+2002-06-01	<rlk@sourceforge.net>
+
+	Files:	po/de.po (1.1) (added)
 
 	file de.po was initially added on branch gimp-print-4_2_branch.
 
 2002-05-28	<mtomlinson@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.86) (+1 -2)
+
+	Remove unneccesary code line in dither_cmy_et
+
+2002-05-28	<mtomlinson@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.66) (+3 -3)
 
 	Fix off-by-one error in VASPRINTF
@@ -13253,6 +16926,12 @@
 
 	Fix ALL_LINGUAS typo
 
+2002-05-19	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.85) (+16 -32)
+
+	Change non-square error-diffusion for eventone dither.
+
 2002-05-18	<rlk@sourceforge.net>
 
 	Files:	src/main/print-util.c (1.65) (+32 -100)
@@ -13262,6 +16941,11 @@
 2002-05-18	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.129) (+3 -2)
+		debian/changelog (1.47) (+2 -1)
+		debian/compat (1.1) (added)
+		debian/control.in (1.28) (+133 -61)
+		debian/cupsys-driver-gimpprint.conffiles (1.5) (removed)
+		debian/rules (1.38) (+3 -6)
 
 	Update packaging to debhelper v4
 	Versioned library development and documentation packages
@@ -13273,6 +16957,15 @@
 
 	Fix install and uninstall; add LINGUAS support
 
+2002-05-17	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.46) (+8 -1)
+		debian/control.in (1.27) (+10 -8)
+		debian/libgimpprint.postinst (1.7) (removed)
+		debian/rules (1.37) (+47 -33)
+
+	Move to debhelper v4; Improve control.in package versioning
+
 2002-05-16	<rlk@sourceforge.net>
 
 	Files:	src/escputil/Makefile.am (1.13) (+1 -1)
@@ -13300,13 +16993,20 @@
 
 2002-05-11	<rlk@sourceforge.net>
 
-	Files:	po/pt.po (1.1) ( )
+	Files:	po/pt.po (1.1) (added)
 
 	file pt.po was initially added on branch gimp-print-4_2_branch.
 
 2002-05-11	<tillkamppeter@sourceforge.net>
 
+	Files:	src/ghost/README (1.71) (+7 -1)
+
+	Some corrections of the previous submission.
+
+2002-05-11	<tillkamppeter@sourceforge.net>
+
 	Files:	README (1.98) (+14 -10)
+		src/ghost/README (1.70) (+4 -8)
 
 	Updates on README files for IJS driver.
 
@@ -13321,6 +17021,7 @@
 2002-05-09	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.11) (+3 -3)
+		src/main/gimp-print-internal.h (1.49) (+3 -13)
 		src/main/print-escp2.c (1.159) (+27 -38)
 		src/main/print-lexmark.c (1.72) (+2 -2)
 		src/main/print-util.c (1.63) (+3 -9)
@@ -13341,12 +17042,25 @@
 
 2002-05-06	<rleigh@sourceforge.net>
 
+	Files:	m4/stp_pkgconfig.m4 (1.2) (+3 -3)
+
+	Fix hard-coding of 'gimpprint', using MODULE_DOWN[] instead
+
+2002-05-06	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.10) (+3 -3)
 
 	Move config.h back to the root; it fixes a gettext bug
 
 2002-05-02	<rleigh@sourceforge.net>
 
+	Files:	debian/changelog (1.45) (+6 -0)
+		debian/control.in (1.26) (+1 -1)
+
+	Move escputil to section utils
+
+2002-05-02	<rleigh@sourceforge.net>
+
 	Files:	configure.ac (1.9) (+11 -7)
 
 	Fix --enable-debug for GNU CC
@@ -13376,7 +17090,7 @@
 
 2002-04-28	<rlk@sourceforge.net>
 
-	Files:	po/es.po (1.1) ( )
+	Files:	po/es.po (1.1) (added)
 
 	Spanish translation
 
@@ -13387,6 +17101,7 @@
 		po/en_GB.po (1.83) (+681 -612)
 		po/fr.po (1.24) (+540 -601)
 		po/nl.po (1.3) (+363 -512)
+		po/no.po (1.24) (+1305 -617)
 		po/pl.po (1.8) (+705 -815)
 		po/sk.po (1.5) (+785 -688)
 		po/sv.po (1.33) (+520 -565)
@@ -13405,12 +17120,16 @@
 		NEWS (1.70) (+25 -285)
 		README (1.97) (+5 -8)
 		configure.ac (1.7) (+27 -14)
+		debian/README.Debian (1.23) (+2 -2)
 		scripts/autogen.sh (1.20) (+1 -1)
+		scripts/texinfo.tex (1.2) (+305 -237)
 		src/cups/Makefile.am (1.49) (+9 -9)
 		src/escputil/Makefile.am (1.12) (+3 -2)
 		src/foomatic/Makefile.am (1.24) (+8 -7)
 		src/ghost/Makefile.am (1.24) (+4 -3)
+		src/ghost/README (1.69) (+14 -12)
 		src/gimp/Makefile.am (1.20) (+4 -3)
+		src/main/print-dither.c (1.84) (+5 -5)
 		src/main/print-escp2.c (1.158) (+202 -193)
 		src/testpattern/Makefile.am (1.7) (+4 -3)
 		test/Makefile.am (1.33) (+8 -6)
@@ -13425,12 +17144,42 @@
 
 	Prep for 4.3.0
 
+2002-04-26	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.83) (+4 -3)
+
+	Improve Eventone's performance on fine checked patterns (at the expense of some waterfalling...)
+
+2002-04-25	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.82) (+4 -5)
+
+	Fix tearing problem around black inks.
+
 2002-04-24	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.39) (+29 -48)
 
 	getopt_long_only has portability problems with some BSD's.
 
+2002-04-23	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.81) (+3 -3)
+
+	Improve waterfalling in EvenTone for six color printers.
+
+2002-04-21	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.80) (+389 -5)
+
+	First cut at implementing all varieties of the EvenTone algorithm.
+
+2002-04-21	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.79) (+319 -287)
+
+	Split Eventone into several functions ready for implementation of other variants. Fix a bug that was causing bad waterfalling.
+
 2002-04-20	<rlk@sourceforge.net>
 
 	Files:	test/run-weavetest (1.11) (+6 -6)
@@ -13457,7 +17206,8 @@
 
 2002-04-14	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.38) (+4 -2)
+	Files:	lib/vasprintf.c (1.4) (+4 -4)
+		src/cups/genppd.c (1.38) (+4 -2)
 		src/main/print-util.c (1.59) (+8 -17)
 
 	543562 Portability issues
@@ -13485,12 +17235,12 @@
 2002-04-08	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.34) (+256 -9)
-		doc/users_guide/cups-edition.sgml (1.1) ( )
+		doc/users_guide/cups-edition.sgml (1.1) (added)
 		doc/users_guide/cups.sgml (1.2) (+6 -2)
-		doc/users_guide/gimp-edition.sgml (1.1) ( )
+		doc/users_guide/gimp-edition.sgml (1.1) (added)
 		doc/users_guide/title.sgml (1.2) (+0 -16)
 		doc/users_guide/users-guide.sgml (1.7) (+18 -0)
-		doc/users_guide/util-edition.sgml (1.1) ( )
+		doc/users_guide/util-edition.sgml (1.1) (added)
 
 
 
@@ -13503,6 +17253,16 @@
 	Corrected margins on DeskJet 2000 per mail from Michel Goraczko to
 	Roger Leigh.
 
+2002-04-07	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.44) (+3 -2)
+		debian/control.in (1.25) (+1 -1)
+		debian/foomatic-db-gimp-print.files (1.1) (added)
+		debian/foomatic-db-gimpprint.files (1.2) (removed)
+		debian/rules (1.36) (+3 -3)
+
+	Rename foomatic-db-gimpprint to foomatic-db-gimp-print
+
 2002-04-07	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.21) (+28 -18)
@@ -13519,8 +17279,13 @@
 
 2002-04-07	<andystewart@sourceforge.net>
 
+	Files:	doc/users_guide/utils.sgml (1.4) (+6 -12)
+
+	*** empty log message ***
+
+2002-04-07	<andystewart@sourceforge.net>
+
 	Files:	doc/users_guide/utils.sgml (1.3) (+9 -5)
-		doc/users_guide/utils.sgml (1.4) (+6 -12)
 
 	*** empty log message ***
 
@@ -13536,12 +17301,17 @@
 2002-04-07	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.33) (+6 -6)
-		doc/users_guide/cups.sgml (1.1) ( )
-		doc/users_guide/gimp.sgml (1.1) ( )
-		doc/users_guide/history.sgml (1.1) ( )
-		doc/users_guide/title.sgml (1.1) ( )
+		doc/users_guide/ch_0.sgml (1.3) (removed)
+		doc/users_guide/ch_1.sgml (1.2) (removed)
+		doc/users_guide/ch_2.sgml (1.2) (removed)
+		doc/users_guide/ch_3.sgml (1.2) (removed)
+		doc/users_guide/ch_4.sgml (1.3) (removed)
+		doc/users_guide/cups.sgml (1.1) (added)
+		doc/users_guide/gimp.sgml (1.1) (added)
+		doc/users_guide/history.sgml (1.1) (added)
+		doc/users_guide/title.sgml (1.1) (added)
 		doc/users_guide/users-guide.sgml (1.6) (+10 -10)
-		doc/users_guide/utils.sgml (1.1) ( )
+		doc/users_guide/utils.sgml (1.1) (added)
 
 
 
@@ -13552,6 +17322,8 @@
 2002-04-07	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.32) (+2 -2)
+		doc/users_guide/ch_0.sgml (1.2) (+3 -3)
+		doc/users_guide/ch_4.sgml (1.2) (+56 -57)
 
 
 
@@ -13587,7 +17359,12 @@
 2002-04-06	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.31) (+21 -6)
-		doc/users_guide/gfdl.sgml (1.1) ( )
+		doc/users_guide/ch_0.sgml (1.1) (added)
+		doc/users_guide/ch_1.sgml (1.1) (added)
+		doc/users_guide/ch_2.sgml (1.1) (added)
+		doc/users_guide/ch_3.sgml (1.1) (added)
+		doc/users_guide/ch_4.sgml (1.1) (added)
+		doc/users_guide/gfdl.sgml (1.1) (added)
 		doc/users_guide/users-guide.sgml (1.5) (+15 -1869)
 
 
@@ -13598,7 +17375,7 @@
 
 2002-04-06	<rlk@sourceforge.net>
 
-	Files:	m4/.cvsignore (1.1) ( )
+	Files:	m4/.cvsignore (1.1) (added)
 
 	Cleanup cvsignore
 
@@ -13612,6 +17389,8 @@
 2002-04-06	<rlk@sourceforge.net>
 
 	Files:	src/ghost/Makefile.am (1.23) (+1 -5)
+		src/ghost/debian-patch (1.4) (removed)
+		src/ghost/debian-patch-stp (1.2) (removed)
 
 	Remove patch intended for Ghostscript 5.10, which is no longer supported.
 
@@ -13627,6 +17406,12 @@
 
 	Try -ltermcap on the third round, not -lcurses a second time.
 
+2002-04-04	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.10) (+18 -5)
+
+	539013 IJS driver must set top left correctly
+
 2002-04-03	<rleigh@sourceforge.net>
 
 	Files:	m4/stp.m4 (1.3) (+1 -0)
@@ -13657,12 +17442,36 @@
 
 	538500 PCL driver buffer overrun
 
+2002-04-03	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.9) (+15 -5)
+
+	Set the page size name in addition to just the dimensions
+
+2002-04-02	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.68) (+112 -111)
+
+	-g is wrong for point size.
+
+2002-03-31	<rleigh@sourceforge.net>
+
+	Files:	m4/stp_path_lib.m4 (1.2) (+2 -2)
+
+	Fix pkgconfig default setting, enable libconfig to be used
+
 2002-03-31	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.18) (+2 -2)
 
 	DeviceGrayscale => DeviceGray
 
+2002-03-31	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.67) (+3 -3)
+
+	DeviceGray ==> DeviceGrayscale
+
 2002-03-30	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/Makefile.am (1.20) (+4 -2)
@@ -13671,6 +17480,24 @@
 
 2002-03-30	<tillkamppeter@sourceforge.net>
 
+	Files:	src/ghost/README (1.66) (+11 -0)
+
+	Added a hint because of the IJS Foomatic data to the src/ghost/README
+
+2002-03-30	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.8) (+2 -2)
+
+	Fix debug output to match argument
+
+2002-03-30	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.7) (+17 -12)
+
+	537248 IJS driver mis-handles -r option
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
 	Files:	README (1.96) (+25 -8)
 
 	Updated Foomatic section of main README, due to IJS.
@@ -13679,40 +17506,222 @@
 
 	Files:	src/foomatic/Makefile.am (1.19) (+8 -2)
 		src/foomatic/foomatic-generator.in (1.17) (+160 -76)
+		src/foomatic/foomatic-templates-gs/Brightness.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/Color.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Contrast.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/Cyan.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/Density.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/Dither.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Gamma.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/ImageType.xml (1.2) (+63 -0)
+		src/foomatic/foomatic-templates-gs/InkType.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/InputSlot.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Magenta.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/MediaType.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Model.xml (1.2) (+21 -0)
+		src/foomatic/foomatic-templates-gs/PageSize.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Quality.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Resolution.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-gs/Saturation.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/Yellow.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-gs/gimp-print.xml (1.2) (+45 -0)
+		src/foomatic/foomatic-templates-ijs/Brightness.xml (1.2) (+24 -0)
 		src/foomatic/foomatic-templates-ijs/Color.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/Contrast.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/Cyan.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/Density.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/Dither.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/Gamma.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/ImageType.xml (1.2) (+63 -0)
+		src/foomatic/foomatic-templates-ijs/InkType.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/InputSlot.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/Magenta.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/MediaType.xml (1.2) (+20 -0)
 		src/foomatic/foomatic-templates-ijs/Model.xml (1.2) (+21 -0)
 		src/foomatic/foomatic-templates-ijs/PageSize.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/Quality.xml (1.2) (+20 -0)
 		src/foomatic/foomatic-templates-ijs/Resolution.xml (1.2) (+20 -0)
+		src/foomatic/foomatic-templates-ijs/Saturation.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/Yellow.xml (1.2) (+24 -0)
+		src/foomatic/foomatic-templates-ijs/gimp-print.xml (1.2) (+48 -0)
+		src/foomatic/foomatic-templates/Brightness.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Color.xml (1.4) (removed)
+		src/foomatic/foomatic-templates/Contrast.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Cyan.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Density.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Dither.xml (1.4) (removed)
+		src/foomatic/foomatic-templates/Gamma.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/ImageType.xml (1.4) (removed)
+		src/foomatic/foomatic-templates/InkType.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/InputSlot.xml (1.2) (removed)
+		src/foomatic/foomatic-templates/Magenta.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/MediaType.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Model.xml (1.2) (removed)
+		src/foomatic/foomatic-templates/PageSize.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Quality.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Resolution.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Saturation.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/Yellow.xml (1.3) (removed)
+		src/foomatic/foomatic-templates/gimp-print.xml (1.5) (removed)
 		src/foomatic/printer_options.c (1.10) (+4 -1)
+		src/ghost/README (1.65) (+1 -1)
+		src/ghost/ijsgimpprint.c (1.6) (+3 -3)
 
 	Added Foomatic data generation for the IJS interface of GIMP-Print.
 	Fixed paths of IJS header files in src/ghost/ijsgimpprint.c
 	Fixed IJS command for the media source in src/ghost/README: It must be "MediaSource" not "InputSlot".
 
+2002-03-30	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.5) (+3 -3)
+
+	Un-fix the header files.
+
+2002-03-30	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.4) (+3 -3)
+
+	Fix paths of IJS header files.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/gimp-print.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/gimp-print.xml (1.1) (added)
+
+	file gimp-print.xml was initially added on branch gimp-print-4_2_branch.
+
 2002-03-30	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-templates-ijs/Resolution.xml (1.1) ( )
+	Files:	src/foomatic/foomatic-templates-gs/Yellow.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Yellow.xml (1.1) (added)
+
+	file Yellow.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Saturation.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Saturation.xml (1.1) (added)
+
+	file Saturation.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Resolution.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Resolution.xml (1.1) (added)
 
 	file Resolution.xml was initially added on branch gimp-print-4_2_branch.
 
 2002-03-30	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-templates-ijs/PageSize.xml (1.1) ( )
+	Files:	src/foomatic/foomatic-templates-gs/Quality.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Quality.xml (1.1) (added)
+
+	file Quality.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/PageSize.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/PageSize.xml (1.1) (added)
 
 	file PageSize.xml was initially added on branch gimp-print-4_2_branch.
 
 2002-03-30	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-templates-ijs/Model.xml (1.1) ( )
+	Files:	src/foomatic/foomatic-templates-gs/Model.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Model.xml (1.1) (added)
 
 	file Model.xml was initially added on branch gimp-print-4_2_branch.
 
 2002-03-30	<tillkamppeter@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-templates-ijs/Color.xml (1.1) ( )
+	Files:	src/foomatic/foomatic-templates-gs/MediaType.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/MediaType.xml (1.1) (added)
+
+	file MediaType.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Magenta.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Magenta.xml (1.1) (added)
+
+	file Magenta.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/InputSlot.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/InputSlot.xml (1.1) (added)
+
+	file InputSlot.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/InkType.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/InkType.xml (1.1) (added)
+
+	file InkType.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/ImageType.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/ImageType.xml (1.1) (added)
+
+	file ImageType.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Gamma.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Gamma.xml (1.1) (added)
+
+	file Gamma.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Dither.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Dither.xml (1.1) (added)
+
+	file Dither.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Density.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Density.xml (1.1) (added)
+
+	file Density.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Cyan.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Cyan.xml (1.1) (added)
+
+	file Cyan.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Contrast.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Contrast.xml (1.1) (added)
+
+	file Contrast.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Color.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Color.xml (1.1) (added)
 
 	file Color.xml was initially added on branch gimp-print-4_2_branch.
 
+2002-03-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-gs/Brightness.xml (1.1) (added)
+		src/foomatic/foomatic-templates-ijs/Brightness.xml (1.1) (added)
+
+	file Brightness.xml was initially added on branch gimp-print-4_2_branch.
+
+2002-03-30	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.64) (+126 -123)
+
+	-g option is used to set paper size for IJS driver.
+
 2002-03-30	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.2) (+3 -2)
@@ -13721,6 +17730,24 @@
 
 	Only genppd needs libz
 
+2002-03-30	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.78) (+7 -25)
+
+	Fix some waterfall and bleed problems in EvenTone.
+
+2002-03-29	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.77) (+117 -101)
+
+	Fix EvenTone and single-ink printers. Make EvenTone use d->n_channels rather than NCOLORS. Free all the memory that was being allocated.
+
+2002-03-28	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates/gimp-print.xml (1.4) (+8 -0)
+
+	Added warning that the Foomatic data is onlyy for GIMP-Print 4.3.x.
+
 2002-03-28	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.30) (+7 -0)
@@ -13747,7 +17774,14 @@
 
 2002-03-24	<rleigh@sourceforge.net>
 
+	Files:	src/main/gimpprint.m4.bot (1.2) (removed)
+
+	Superseded by gimpprint.m4.top
+
+2002-03-24	<rleigh@sourceforge.net>
+
 	Files:	m4/stp.m4 (1.2) (+1 -2)
+		src/main/gimpprint.m4.top (1.2) (+11 -4)
 
 	*** empty log message ***
 
@@ -13759,6 +17793,24 @@
 
 2002-03-23	<rleigh@sourceforge.net>
 
+	Files:	src/main/gimpprint.pc.in (1.2) (removed)
+
+	Remove gimpprint.pc.in (now generated by configure)
+
+2002-03-23	<rleigh@sourceforge.net>
+
+	Files:	src/main/gimpprint-config.in (1.7) (removed)
+
+	Remove gimpprint-config.in (now generated by configure)
+
+2002-03-23	<rleigh@sourceforge.net>
+
+	Files:	src/main/gimp-print.pc.in (1.2) (removed)
+
+	Remove old pkg-config template (renamed to gimpprint.pc.in)
+
+2002-03-23	<rleigh@sourceforge.net>
+
 	Files:	autogen.sh (1.5) (+1 -1)
 		doc/README.maintaining (1.13) (+17 -18)
 
@@ -13766,22 +17818,37 @@
 
 2002-03-23	<rleigh@sourceforge.net>
 
-	Files:	acconfig.h (1.17) (+1 -1)
+	Files:	acconfig.h (1.17) (removed)
 		autogen.sh (1.4) (+1 -1)
-		configure.ac (1.1) ( )
+		configure.ac (1.1) (added)
+		configure.in.in (1.121) (removed)
+		debian/rules (1.35) (+2 -2)
 		doc/README.maintaining (1.12) (+16 -22)
+		doc/developer/integrating.texi (1.2) (+4 -4)
 		scripts/autogen.sh (1.18) (+12 -18)
 		src/main/.cvsignore (1.7) (+1 -1)
+		src/main/gimpprint-config.in (1.6) (+259 -88)
+		src/main/gimpprint.m4 (1.7) (removed)
+		src/main/gimpprint.m4.bot (1.1) (added)
+		src/main/gimpprint.m4.top (1.1) (added)
+		src/main/gimpprint.pc.in (1.1) (added)
 
 	Update build: configure.ac and related files
 	Update documentation to describe the new build
 
 2002-03-23	<rleigh@sourceforge.net>
 
+	Files:	configure.ac.in (1.5) (removed)
+
+	Remove redundant configure.ac.in now configure.ac is not generated
+
+2002-03-23	<rleigh@sourceforge.net>
+
 	Files:	Makefile.am (1.127) (+9 -20)
 		doc/Makefile.am (1.31) (+6 -6)
 		doc/developer/Makefile.am (1.6) (+6 -5)
 		doc/users_guide/Makefile.am (1.30) (+4 -2)
+		include/gimp-print/Makefile.am (1.3) (+6 -4)
 		man/Makefile.am (1.7) (+16 -2)
 		samples/Makefile.am (1.4) (+6 -6)
 		src/Makefile.am (1.12) (+2 -3)
@@ -13805,16 +17872,24 @@
 
 2002-03-23	<rleigh@sourceforge.net>
 
-	Files:	m4/gimp.m4 (1.2) (+0 -0)
-		m4/stp.m4 (1.1) ( )
-		m4/stp_cups.m4 (1.1) ( )
-		m4/stp_gimp.m4 (1.1) ( )
-		m4/stp_option.m4 (1.1) ( )
-		m4extra/gettext.m4 (1.1) ( )
-		m4extra/lcmessage.m4 (1.1) ( )
-		m4extra/libtool.m4 (1.1) ( )
-		m4extra/progtest.m4 (1.1) ( )
-		m4extra/stp_release.m4.in (1.1) ( )
+	Files:	m4/gettext.m4 (1.2) (removed)
+		m4/gimp.m4 (1.2) (removed)
+		m4/lcmessage.m4 (1.2) (removed)
+		m4/libtool.m4 (1.2) (removed)
+		m4/progtest.m4 (1.2) (removed)
+		m4/stp.m4 (1.1) (added)
+		m4/stp_cups.m4 (1.1) (added)
+		m4/stp_gimp.m4 (1.1) (added)
+		m4/stp_libconfig.m4 (1.1) (added)
+		m4/stp_option.m4 (1.1) (added)
+		m4/stp_path_lib.m4 (1.1) (added)
+		m4/stp_pkgconfig.m4 (1.1) (added)
+		m4extra/gettext.m4 (1.1) (added)
+		m4extra/gimp.m4 (1.1) (added)
+		m4extra/lcmessage.m4 (1.1) (added)
+		m4extra/libtool.m4 (1.1) (added)
+		m4extra/progtest.m4 (1.1) (added)
+		m4extra/stp_release.m4.in (1.1) (added)
 
 	Update build: add new m4 macros
 
@@ -13824,6 +17899,13 @@
 
 	Calibrated the Epson 680 multishot inks.
 
+2002-03-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.76) (+11 -8)
+
+	Fix very fast dithering (533400).  Needs to be back ported to 4.2
+	after fix is code reviewed.
+
 2002-03-21	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.29) (+1 -0)
@@ -13832,6 +17914,12 @@
 
 2002-03-18	<mtomlinson@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.75) (+251 -217)
+
+	Speed improvements to EvenTone algorithm.
+
+2002-03-18	<mtomlinson@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.13) (+3 -3)
 
 	Minor change to ink dot sizes.
@@ -13847,6 +17935,18 @@
 
 2002-03-17	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.120) (+3 -2)
+
+	Really don't link anything but genppd against libz.
+
+2002-03-17	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.119) (+1 -2)
+
+	libz is only needed for building the PPD files.
+
+2002-03-17	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.11) (+107 -55)
 		src/main/print-escp2.c (1.156) (+11 -12)
 		src/main/print-escp2.h (1.6) (+14 -1)
@@ -13861,7 +17961,8 @@
 
 2002-03-16	<rlk@sourceforge.net>
 
-	Files:	po/nl.po (1.2) (+2919 -0)
+	Files:	configure.in.in (1.118) (+2 -2)
+		po/nl.po (1.2) (+2919 -0)
 
 	Add Dutch translation.
 
@@ -13869,8 +17970,11 @@
 
 	Files:	Makefile.am (1.125) (+3 -34)
 		README (1.95) (+2 -6)
+		configure.ac.in (1.4) (+3 -22)
+		configure.in.in (1.117) (+1 -26)
 		doc/README.maintaining (1.11) (+1 -2)
 		po/POTFILES.in (1.12) (+0 -4)
+		scripts/patch-gimp (1.2) (removed)
 		src/Makefile.am (1.11) (+1 -3)
 
 	Remove patch-gimp, as the GIMP folks won't be needing this any more.
@@ -13883,7 +17987,7 @@
 
 2002-03-16	<rlk@sourceforge.net>
 
-	Files:	po/nl.po (1.1) ( )
+	Files:	po/nl.po (1.1) (added)
 
 	file nl.po was initially added on branch gimp-print-4_2_branch.
 
@@ -13913,6 +18017,67 @@
 
 	Fix 528922 from mainline.
 
+2002-03-10	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.74) (+4 -4)
+
+	Reduced the effect of the last change. Waterfalling now present again, but hopefully a bit better.
+
+2002-03-09	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.73) (+26 -9)
+
+	Fix some more ink-bleed problems in dark areas. Change black handling
+	a little. Tune EvenTone parameter. Fix tearing!!! If you still think you
+	see waterfalling, you're imaging it.
+
+2002-03-06	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.43) (+6 -1)
+		debian/rules (1.34) (+2 -2)
+
+	Enable library versioning with dh_makeshlibs and update changelog
+
+2002-03-04	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.72) (+16 -15)
+
+	Fixed non-square aspect ratio in EvenTone. Fix some ink-bleeding in dark areas.
+
+2002-03-03	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.63) (+4 -4)
+
+	Minor update
+
+2002-03-03	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.62) (+12 -0)
+
+	Add EvenTone screen
+
+2002-03-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.71) (+4 -2)
+
+	Rename "Even" to "EvenTone", and add note for translators that
+	EvenTone is a proper name, not a description.
+
+2002-03-03	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.70) (+37 -33)
+
+	Change "Error Diffusion" to "EvenTone". Improve dither pattern. Change to standard black level method.
+
+2002-03-02	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.24) (+1 -1)
+		debian/cupsys-driver-gimpprint.postinst (1.1) (added)
+		debian/cupsys-driver-gimpprint.postrm (1.4) (+4 -0)
+
+	Fix gs dependency
+	Fix cupsys-driver-gimpprint to reload cupsys on configure/removal
+
 2002-03-02	<rlk@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.75) (+33 -9)
@@ -13941,12 +18106,24 @@
 	canon.c, epson.c: use read() instead of fread() in order not to block
 	  waiting for incoming data.  Ignore 0-byte backchannel reads.
 
+2002-02-26	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.69) (+10 -18)
+
+	Fix ink selection. Make non-square ratios work better.
+
 2002-02-26	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.26) (+1 -0)
 
 	Z53
 
+2002-02-25	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.68) (+56 -61)
+
+	Improve (hopefully) the transition from photo-dark inks.
+
 2002-02-24	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.42) (+30 -34)
@@ -13963,6 +18140,7 @@
 2002-02-23	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.69) (+1 -0)
+		src/ghost/README (1.61) (+1 -0)
 		src/main/printers.xml (1.43) (+10 -1)
 
 	Lexmark Z53 works
@@ -13979,18 +18157,61 @@
 
 	Now need to ignore .deps
 
+2002-02-22	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.116) (+13 -11)
+
+	Fix use of AC_PROG_PATH
+
+2002-02-21	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.3) (+3 -3)
+
+	Typo
+
+2002-02-21	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.23) (+1 -1)
+
+	Add Build-Depends for foomatic-bin
+
 2002-02-20	<rlk@sourceforge.net>
 
 	Files:	AUTHORS (1.11) (+17 -3)
 
 	Updates
 
+2002-02-20	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.67) (+9 -23)
+
+	Fix from Mark
+
+2002-02-19	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.66) (+21 -24)
+
+	Minor black changes. Fix small bug in eventone.
+
+2002-02-18	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.65) (+41 -4)
+
+	Improve black transition. Improve photo ink transitions.
+
+2002-02-17	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.64) (+101 -85)
+
+	Error diffusion: Sort out black ink usage. Also first cut at getting photo inks right.
+
 2002-02-16	<rlk@sourceforge.net>
 
 	Files:	po/da.po (1.16) (+614 -1253)
 		po/el.po (1.2) (+2930 -0)
 		po/en_GB.po (1.82) (+561 -596)
 		po/fr.po (1.23) (+560 -489)
+		po/no.po (1.23) (+607 -1289)
 		po/pl.po (1.7) (+788 -671)
 		po/sk.po (1.4) (+637 -699)
 		po/sv.po (1.32) (+505 -412)
@@ -13999,7 +18220,7 @@
 
 2002-02-16	<rlk@sourceforge.net>
 
-	Files:	po/el.po (1.1) ( )
+	Files:	po/el.po (1.1) (added)
 
 	file el.po was initially added on branch gimp-print-4_2_branch.
 
@@ -14015,12 +18236,37 @@
 
 	Minor update
 
+2002-02-16	<rleigh@sourceforge.net>
+
+	Files:	doc/print-setup.txt (1.1) (added)
+
+	file print-setup.txt was initially added on branch gimp-print-4_2_branch.
+
+2002-02-16	<rleigh@sourceforge.net>
+
+	Files:	doc/print-main.txt (1.1) (added)
+
+	file print-main.txt was initially added on branch gimp-print-4_2_branch.
+
+2002-02-16	<rleigh@sourceforge.net>
+
+	Files:	doc/print-color.txt (1.1) (added)
+
+	file print-color.txt was initially added on branch gimp-print-4_2_branch.
+
+2002-02-15	<rlk@sourceforge.net>
+
+	Files:	src/ghost/ijsgimpprint.c (1.2) (+24 -24)
+
+	I18N
+
 2002-02-15	<rlk@sourceforge.net>
 
 	Files:	po/POTFILES.in (1.11) (+3 -0)
 		po/da.po (1.15) (+409 -547)
 		po/en_GB.po (1.81) (+584 -549)
 		po/fr.po (1.22) (+478 -549)
+		po/no.po (1.22) (+409 -547)
 		po/pl.po (1.6) (+430 -547)
 		po/sk.po (1.3) (+699 -637)
 		po/sv.po (1.31) (+583 -548)
@@ -14029,6 +18275,12 @@
 
 2002-02-14	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.60) (+5 -1)
+
+	Minor update
+
+2002-02-14	<rlk@sourceforge.net>
+
 	Files:	src/ghost/Makefile.am (1.21) (+2 -2)
 
 	Typo
@@ -14041,8 +18293,20 @@
 
 2002-02-14	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.115) (+2 -2)
+
+	Slovak language
+
+2002-02-14	<rlk@sourceforge.net>
+
 	Files:	README (1.94) (+33 -11)
+		configure.in.in (1.114) (+2 -2)
 		src/ghost/Makefile.am (1.20) (+22 -1)
+		src/ghost/README (1.59) (+237 -43)
+		src/ghost/ijsgimpprint.c (1.1) (added)
+		src/ijs/.cvsignore (1.2) (removed)
+		src/ijs/Makefile.am (1.3) (removed)
+		src/ijs/ijsgimpprint.c (1.8) (removed)
 
 	Move IJS into src/ghost
 
@@ -14056,19 +18320,59 @@
 
 2002-02-14	<rlk@sourceforge.net>
 
-	Files:	po/sk.po (1.1) ( )
+	Files:	po/sk.po (1.1) (added)
 
 	file sk.po was initially added on branch gimp-print-4_2_branch.
 
+2002-02-13	<rlk@sourceforge.net>
+
+	Files:	src/ijs/ijsgimpprint.c (1.7) (+97 -46)
+
+	Test to at least early beta quality.
+
+2002-02-05	<easysw@sourceforge.net>
+
+	Files:	cups/cups-gimpprint.list.in (1.1) (added)
+
+	Dunno why I didn't commit this file...
+
+2002-02-05	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.63) (+13 -4)
+
+	Improve eventone calculations.
+
 2002-02-03	<rleigh@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.16) (+1 -1)
 
 	Remove hard-coded template path
 
+2002-02-03	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.62) (+9 -8)
+
+	Fix silly mistake with black levels
+
+2002-02-02	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.61) (+135 -26)
+
+	Incorporate eventone into error-diffusion. Respect k_upper and k_lower.
+
+2002-02-01	<rleigh@sourceforge.net>
+
+	Files:	debian/foomatic-db-gimpprint.files (1.1) (added)
+
+	Add foomatic-db-gimpprint package
+
 2002-02-01	<rleigh@sourceforge.net>
 
-	Files:	src/foomatic/Makefile.am (1.17) (+8 -3)
+	Files:	configure.in.in (1.113) (+12 -12)
+		debian/changelog (1.42) (+2 -1)
+		debian/control.in (1.22) (+14 -0)
+		debian/rules (1.33) (+3 -2)
+		src/foomatic/Makefile.am (1.17) (+8 -3)
 		src/foomatic/foomatic-generator.in (1.15) (+8 -2)
 
 	Enable foomatic VPATH build
@@ -14101,12 +18405,24 @@
 
 	Better filter on versions
 
+2002-01-29	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.58) (+4 -4)
+
+	Minor typos
+
 2002-01-27	<rlk@sourceforge.net>
 
 	Files:	src/main/print-util.c (1.56) (+67 -6)
 
 	Check more values during verification
 
+2002-01-27	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates/gimp-print.xml (1.3) (+22 -15)
+
+	Updates of text in the Foomatic database entry for GIMP-Print.
+
 2002-01-26	<rleigh@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.29) (+3 -3)
@@ -14115,26 +18431,52 @@
 
 2002-01-26	<rleigh@sourceforge.net>
 
-	Files:	Makefile.am (1.124) (+1 -5)
+	Files:	HACKING (1.2) (removed)
+		Makefile.am (1.124) (+1 -5)
 		doc/Makefile.am (1.30) (+2 -2)
 		doc/README.maintaining (1.10) (+1 -1)
 
 	Move HACKING back to doc/README.maintaining
 
+2002-01-26	<rlk@sourceforge.net>
+
+	Files:	src/ijs/ijsgimpprint.c (1.6) (+3 -1)
+
+	Note that Russell Lang originally wrote this.
+
 2002-01-25	<rleigh@sourceforge.net>
 
-	Files:	Makefile.am (1.123) (+2 -2)
+	Files:	HACKING (1.1) (added)
+		Makefile.am (1.123) (+2 -2)
 		doc/Makefile.am (1.29) (+2 -2)
-		doc/README.maintaining (1.9) (+1 -1)
+		doc/README.maintaining (1.9) (removed)
 
 	Move doc/README.maintaining to HACKING
 
+2002-01-25	<rlk@sourceforge.net>
+
+	Files:	src/ijs/ijsgimpprint.c (1.5) (+4 -1)
+
+	Fix a few missing variables
+
+2002-01-25	<rlk@sourceforge.net>
+
+	Files:	src/ijs/ijsgimpprint.c (1.4) (+8 -2)
+
+	Monochrome output
+
 2002-01-24	<rlk@sourceforge.net>
 
 	Files:	src/cups/rastertoprinter.c (1.20) (+4 -2)
 
 	Set left and top correctly
 
+2002-01-24	<rlk@sourceforge.net>
+
+	Files:	src/ghost/gdevstp.c (1.15) (+3 -1)
+
+	Set the left and orientation correctly.
+
 2002-01-23	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.8) (+6 -6)
@@ -14143,6 +18485,24 @@
 
 2002-01-21	<rlk@sourceforge.net>
 
+	Files:	src/ijs/ijsgimpprint.c (1.3) (+7 -11)
+
+	Fix color output mode?
+
+2002-01-21	<rlk@sourceforge.net>
+
+	Files:	src/ijs/ijsgimpprint.c (1.2) (+322 -15)
+
+	Generates output with 0.32 of IJS
+
+2002-01-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.60) (+2 -2)
+
+	Minor bug in row ends: subchannel count may not be exactly 2.
+
+2002-01-21	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.7) (+3 -3)
 
 	5000/5500 take the same paper sizes as the 2000.
@@ -14166,12 +18526,57 @@
 	Dynamically allocate the comp_buf instead of having it fixed. Fixes crashes
 	when using larger paper sizes in DesignJet.
 
+2002-01-15	<ttonino@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.59) (+9 -5)
+
+	Changed divisor in error distribution to take aspect ratio into account.
+	Dots should be on equal distance on paper, whether resolution is 300 x
+	300 or 2880 x 720.
+
+2002-01-12	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.58) (+20 -4)
+
+	Change dithering to Thomas Tonino's suggestion.
+
+2002-01-11	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.57) (+28 -23)
+
+	Still correcting that density
+
+2002-01-11	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.112) (+8 -4)
+		src/ijs/Makefile.am (1.2) (+4 -4)
+
+	Update for ijs 0.30
+
+2002-01-08	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.56) (+5 -1)
+
+	Scale new dither by correct density
+
 2002-01-05	<rlk@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.46) (+3 -1)
 
 	Print useful warning messages
 
+2002-01-04	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.55) (+3 -3)
+
+	Fix xstep calculation
+
+2002-01-04	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.54) (+18 -39)
+
+	Added some free() calls, and code savings
+
 2002-01-04	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.70) (+2 -2)
@@ -14187,6 +18592,26 @@
 	499200 ESP 1280/1290 need special deinit code
 	499203 ESP 780/820 have different paper codes
 
+2002-01-03	<mtomlinson@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.53) (+304 -2)
+
+	Added new Error Diffusion dither
+
+2002-01-01	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.41) (+2 -2)
+		debian/control.in (1.21) (+1 -1)
+
+	Add versioned Replaces for gimpprint-locales from debian-branch
+
+2001-12-30	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.40) (+5 -1)
+		debian/control.in (1.20) (+3 -3)
+
+	Merge debian/control.in fixes from debian-branch
+
 2001-12-26	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.69) (+4 -1)
@@ -14205,7 +18630,8 @@
 
 2001-12-23	<rlk@sourceforge.net>
 
-	Files:	test/run-testdither (1.3) (+6 -3)
+	Files:	src/main/print-dither.c (1.52) (+158 -317)
+		test/run-testdither (1.3) (+6 -3)
 		test/testdither.c (1.14) (+4 -4)
 
 	A bit more cleanup work on the dither code.
@@ -14221,10 +18647,27 @@
 2001-12-21	<rlk@sourceforge.net>
 
 	Files:	src/main/Makefile.am (1.31) (+2 -1)
+		src/main/gimp-print-internal.h (1.48) (+2 -6)
 		src/main/print-dither-matrices.c (1.5) (+238 -3)
+		src/main/print-dither.c (1.51) (+472 -422)
+		src/main/print-dither.h (1.1) (added)
 
 	Start splitting up the dither code
 
+2001-12-20	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.111) (+2 -2)
+
+	Fix OSTYPE with AC_DEFINE_UNQUOTED
+
+2001-12-20	<rleigh@sourceforge.net>
+
+	Files:	configure.ac.in (1.3) (+117 -209)
+
+	Fix OSTYPE with AC_DEFINE_UNQUOTED
+	New macros AC_STP_ARG_WITH and AC_STP_ARG_ENABLE to simplify things
+	Fix quoting of other AC_DEFINEs
+
 2001-12-20	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.25) (+2 -0)
@@ -14234,19 +18677,45 @@
 2001-12-19	<rleigh@sourceforge.net>
 
 	Files:	.cvsignore (1.17) (+1 -0)
+		configure.ac.in (1.2) (+3 -3)
+		configure.in.in (1.110) (+2 -2)
 
 	Use AM_ACLOCAL_INCLUDE correctly
 	Add m4local to .cvsignore
 
 2001-12-19	<rleigh@sourceforge.net>
 
+	Files:	configure.ac.in (1.1) (added)
+
+	Add configure template for autoconf 2.50
+
+2001-12-19	<rleigh@sourceforge.net>
+
 	Files:	Makefile.am (1.121) (+2 -2)
-		m4/gimp.m4 (1.1) ( )
+		gimp.m4 (1.5) (removed)
+		m4/gettext.m4 (1.1) (added)
+		m4/gimp.m4 (1.1) (added)
+		m4/lcmessage.m4 (1.1) (added)
+		m4/libtool.m4 (1.1) (added)
+		m4/progtest.m4 (1.1) (added)
 		scripts/autogen.sh (1.17) (+12 -0)
+		scripts/gettext.m4 (1.2) (removed)
+		scripts/gimp.m4 (1.3) (removed)
+		scripts/lcmessage.m4 (1.2) (removed)
+		scripts/libtool.m4 (1.2) (removed)
+		scripts/progtest.m4 (1.2) (removed)
 
 	New directory m4 to hold m4 macros, and m4local is created by autogen.sh
 	to put symlinks or macros in to be used by aclocal.
 
+2001-12-19	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.109) (+4 -5)
+
+	Fix typo in help string --with-translated-ppds
+	Remove unused YACC and BISON checks (they are still checked for)
+	Clean up ACLOCAL flags
+
 2001-12-19	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.154) (+8 -3)
@@ -14256,8 +18725,16 @@
 
 2001-12-18	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.74) (+17 -30)
+	Files:	src/main/print-dither.c (1.50) (+1 -16)
+
+	Remove unused routine
+
+2001-12-18	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-internal.h (1.47) (+3 -2)
+		src/main/print-canon.c (1.74) (+17 -30)
 		src/main/print-color.c (1.27) (+5 -5)
+		src/main/print-dither.c (1.49) (+12 -15)
 		src/main/print-escp2.c (1.153) (+9 -18)
 		src/main/print-lexmark.c (1.68) (+13 -25)
 		src/main/print-ps.c (1.27) (+7 -6)
@@ -14268,6 +18745,12 @@
 
 2001-12-17	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.48) (+5 -5)
+
+	Clean up overzealous statics
+
+2001-12-17	<rlk@sourceforge.net>
+
 	Files:	test/run-testdither (1.2) (+0 -1)
 		test/testdither.c (1.13) (+20 -22)
 
@@ -14275,20 +18758,38 @@
 
 2001-12-16	<rlk@sourceforge.net>
 
-	Files:	src/Makefile.am (1.8) (+2 -2)
+	Files:	src/main/print-dither.c (1.47) (+8 -19)
+
+	Minor cleanup
+
+2001-12-16	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.108) (+29 -2)
+		src/Makefile.am (1.8) (+2 -2)
+		src/ijs/.cvsignore (1.1) (added)
+		src/ijs/Makefile.am (1.1) (added)
+		src/ijs/ijsgimpprint.c (1.1) (added)
 
 	Add IJS server support
 
+2001-12-16	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.57) (+9 -9)
+
+	Fix Canon resolution names
+
 2001-12-14	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.73) (+11 -4)
+	Files:	src/main/gimp-print-internal.h (1.46) (+22 -7)
+		src/main/print-canon.c (1.73) (+11 -4)
+		src/main/print-dither.c (1.46) (+294 -174)
 		src/main/print-escp2.c (1.152) (+13 -3)
 		src/main/print-escp2.h (1.4) (+1 -2)
 		src/main/print-lexmark.c (1.67) (+12 -3)
 		src/main/print-pcl.c (1.49) (+18 -9)
 		src/main/print-util.c (1.54) (+14 -1)
 		test/Makefile.am (1.31) (+3 -3)
-		test/run-testdither (1.1) ( )
+		test/run-testdither (1.1) (added)
 		test/testdither.c (1.12) (+208 -83)
 
 	Generalize the dither code somewhat.
@@ -14299,9 +18800,17 @@
 
 	Added Canon BJC-2010.
 
+2001-12-07	<rleigh@sourceforge.net>
+
+	Files:	scripts/make-deb.sh (1.3) (removed)
+
+	Remove debian ghostscript package building script, as the stp patch is now included in the Debian gs package
+
 2001-12-07	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.72) (+30 -30)
+	Files:	src/main/gimp-print-internal.h (1.45) (+5 -5)
+		src/main/print-canon.c (1.72) (+30 -30)
+		src/main/print-dither.c (1.45) (+313 -300)
 		src/main/print-escp2-data.c (1.4) (+74 -74)
 		src/main/print-pcl.c (1.48) (+7 -7)
 
@@ -14311,7 +18820,12 @@
 2001-12-07	<rlk@sourceforge.net>
 
 	Files:	README (1.92) (+9 -10)
+		configure.in.in (1.107) (+1 -14)
 		src/ghost/Makefile.am (1.19) (+1 -100)
+		src/ghost/README (1.56) (+14 -152)
+		src/ghost/README.bsd (1.3) (removed)
+		src/ghost/contrib.mak.addon.old (1.3) (removed)
+		src/ghost/devs.mak.addon-5.10 (1.7) (removed)
 
 	Remove old-style Ghostscript build.
 
@@ -14325,8 +18839,13 @@
 
 2001-12-05	<rleigh@sourceforge.net>
 
-	Files:	src/main/.cvsignore (1.6) (+1 -0)
+	Files:	configure.in.in (1.106) (+3 -2)
+		debian/changelog (1.39) (+2 -1)
+		debian/libgimpprint-dev.files (1.5) (+1 -0)
+		debian/rules (1.32) (+2 -2)
+		src/main/.cvsignore (1.6) (+1 -0)
 		src/main/Makefile.am (1.30) (+7 -2)
+		src/main/gimp-print.pc.in (1.1) (added)
 
 	Add pkgconfig support
 	Add src/main/print-escp2.h to src/main/Makefile.am
@@ -14341,7 +18860,8 @@
 
 2001-12-02	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.150) (+2 -2)
+	Files:	src/main/gimp-print-internal.h (1.44) (+23 -54)
+		src/main/print-escp2.c (1.150) (+2 -2)
 		src/main/print-lexmark.c (1.66) (+59 -30)
 		src/main/print-weave.c (1.37) (+73 -14)
 		test/escp2-weavetest.c (1.20) (+3 -2)
@@ -14352,6 +18872,8 @@
 
 	Files:	src/ghost/.cvsignore (1.7) (+2 -0)
 		src/ghost/Makefile.am (1.18) (+27 -5)
+		src/ghost/contrib.mak.addon.old (1.2) (+5 -1)
+		src/ghost/devs.mak.addon-5.10 (1.6) (+5 -1)
 
 	Split Epson driver into two parts
 
@@ -14384,6 +18906,27 @@
 
 2001-12-01	<rleigh@sourceforge.net>
 
+	Files:	debian/.cvsignore (1.6) (+0 -1)
+		debian/changelog (1.38) (+2 -1)
+		debian/control.in (1.19) (+21 -22)
+
+	Update package descriptions for 4.3
+	Packages depends on libgimpprint-locales >= the Source-Version
+
+2001-12-01	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.37) (+6 -1)
+		debian/control.in (1.18) (+17 -2)
+		debian/gimpprint-locales.files (1.1) (added)
+		debian/libgimpprint-doc.doc-base (1.1) (added)
+		debian/libgimpprint.files (1.7) (+0 -1)
+		debian/rules (1.31) (+2 -2)
+
+	New gimpprint-locales package to hold the message catalogues
+	Add libgimpprint-doc.doc-base
+
+2001-12-01	<rleigh@sourceforge.net>
+
 	Files:	doc/developer/.cvsignore (1.2) (+1 -1)
 		doc/developer/Makefile.am (1.2) (+2 -2)
 
@@ -14391,10 +18934,44 @@
 
 2001-12-01	<rleigh@sourceforge.net>
 
-	Files:	doc/.cvsignore (1.7) (+0 -31)
+	Files:	configure.in.in (1.105) (+2 -2)
+		doc/.cvsignore (1.7) (+0 -31)
 		doc/Makefile.am (1.28) (+12 -148)
-		doc/developer/.cvsignore (1.1) ( )
-		doc/developer/Makefile.am (1.1) ( )
+		doc/appendices.texi (1.5) (removed)
+		doc/copying.texi (1.2) (removed)
+		doc/developer/.cvsignore (1.1) (added)
+		doc/developer/Makefile.am (1.1) (added)
+		doc/developer/copying.texi (1.1) (added)
+		doc/developer/dither.texi (1.1) (added)
+		doc/developer/escp2.texi (1.1) (added)
+		doc/developer/functions.texi (1.1) (added)
+		doc/developer/gimpprint.texi (1.1) (added)
+		doc/developer/gpl.texi (1.1) (added)
+		doc/developer/indices.texi (1.1) (added)
+		doc/developer/integrating.texi (1.1) (added)
+		doc/developer/introduction.texi (1.1) (added)
+		doc/developer/new-printer.texi (1.1) (added)
+		doc/developer/overview.texi (1.1) (added)
+		doc/developer/problems.texi (1.1) (added)
+		doc/developer/using.texi (1.1) (added)
+		doc/developer/weave.texi (1.1) (added)
+		doc/dither.texi (1.4) (removed)
+		doc/escp2.texi (1.5) (removed)
+		doc/functions.texi (1.7) (removed)
+		doc/gimpprint.texi (1.7) (removed)
+		doc/gpl.texi (1.3) (removed)
+		doc/indices.texi (1.4) (removed)
+		doc/integrating.texi (1.3) (removed)
+		doc/introduction.texi (1.5) (removed)
+		doc/new-printer.texi (1.6) (removed)
+		doc/overview.texi (1.2) (removed)
+		doc/print-color.png (1.2) (removed)
+		doc/print-main.png (1.3) (removed)
+		doc/print-setup.png (1.2) (removed)
+		doc/problems.texi (1.2) (removed)
+		doc/programs.texi (1.7) (removed)
+		doc/using.texi (1.4) (removed)
+		doc/weave.texi (1.4) (removed)
 
 	Move the Texinfo manual from doc to doc/developer.
 	Remove user documentation from the manual, now it is in the User's Guide
@@ -14402,9 +18979,38 @@
 	Rename the manual as a 'Developer's manual'
 	Update configure.in.in and the Makefiles
 
+2001-11-30	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates/Color.xml (1.3) (+0 -1)
+		src/foomatic/foomatic-templates/Dither.xml (1.3) (+0 -1)
+		src/foomatic/foomatic-templates/InkType.xml (1.2) (+0 -1)
+		src/foomatic/foomatic-templates/MediaType.xml (1.2) (+0 -1)
+		src/foomatic/foomatic-templates/PageSize.xml (1.2) (+0 -1)
+		src/foomatic/foomatic-templates/Quality.xml (1.2) (+0 -1)
+		src/foomatic/foomatic-templates/Resolution.xml (1.2) (+0 -1)
+
+	Removed "<arg_required />" tags from options which are not required when using GhostScript with GIMP-Print.
+
+2001-11-25	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.36) (+8 -0)
+		debian/libgimpprint.postinst (1.6) (+7 -13)
+
+	Update version to 4.3.0-1
+	Fix lintian ldconfig warning
+
+2001-11-24	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.17) (+5 -5)
+		debian/rules (1.30) (+7 -7)
+
+	Update Debian packaging to use non-versioned shared libraries
+	Fix Debian build (arch-indep documentation installation)
+
 2001-11-24	<rlk@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.28) (+5 -5)
+	Files:	configure.in.in (1.104) (+2 -2)
+		src/main/Makefile.am (1.28) (+5 -5)
 
 	Kick off 4.3 development
 
@@ -14413,6 +19019,7 @@
 	Files:	po/da.po (1.14) (+1 -1)
 		po/en_GB.po (1.80) (+2 -2)
 		po/fr.po (1.21) (+1 -1)
+		po/no.po (1.21) (+1 -1)
 		po/pl.po (1.5) (+1 -1)
 		po/sv.po (1.30) (+1 -1)
 
@@ -14424,6 +19031,44 @@
 
 	Set release date.
 
+2001-11-24	<sharkey@sourceforge.net>
+
+	Files:	scripts/buildgimpprintdebs (1.2) (+3 -8)
+
+	Radically alter the way debs are built.  The upstream source tarball
+	is no longer used at all, instead, build directly from CVS, generate
+	an upstream tarball on the fly using the -U option of cvs-buildpackage,
+	and diff that with the debian branch.  The debian/rules now configures
+	in maintainer mode, so the only preprocessing we need to do is to generate
+	debian/control from debian/control.in before starting dpkg-buildpackage.
+
+2001-11-24	<sharkey@sourceforge.net>
+
+	Files:	debian/control.in (1.16) (+1 -1)
+
+	Merge with debian-branch.  Add build dependencies on imagemagick and
+	docbook-utils.
+
+2001-11-24	<sharkey@sourceforge.net>
+
+	Files:	debian/rules (1.29) (+6 -7)
+
+	Merge with debian branch.  Enable maintainer mode and copy docs
+	from debian/gimp-print-build/doc, not doc.
+
+2001-11-24	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.35) (+2 -7)
+
+	Revert version increase from 4.2.0-2 to 4.2.0-1
+
+2001-11-24	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.34) (+7 -0)
+		debian/rules (1.28) (+2 -2)
+
+	Use PostScript Level 2 PPD files, not Level 3
+
 2001-11-23	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/figures/cups_admin_model.png (1.2) (+49 -62)
@@ -14438,6 +19083,20 @@
 
 	484979 Cannot rebuild configure from tarball
 
+2001-11-23	<sharkey@sourceforge.net>
+
+	Files:	configure.in.in (1.103) (+2 -2)
+
+	Sync with debian branch.  Accept "dvipdfm" as an alternative to
+	"dvipdf".
+
+2001-11-23	<sharkey@sourceforge.net>
+
+	Files:	debian/copyright (1.5) (+2 -2)
+
+	Sync mainline with debian branch.  Reformat copyright file to avoid
+	lintian warning.
+
 2001-11-23	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.67) (+4 -4)
@@ -14455,6 +19114,7 @@
 
 	Files:	NEWS (1.66) (+2 -5)
 		src/foomatic/foomatic-printermap (1.23) (+0 -3)
+		src/ghost/README (1.55) (+0 -3)
 		src/main/printers.xml (1.42) (+1 -31)
 
 	Remove support for Lexmark 3200 and Z31 printers, and clones.
@@ -14466,24 +19126,35 @@
 
 	Update CUPS README for 4.2 release.
 
+2001-11-22	<rleigh@sourceforge.net>
+
+	Files:	debian/README.Debian (1.22) (+1 -1)
+		debian/changelog (1.33) (+6 -0)
+
+	Update debian/changelog, and dates for 4.2.0
+
 2001-11-22	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.65) (+431 -896)
+		NEWS.4.2 (1.29) (removed)
 		README (1.90) (+33 -16)
+		configure.in.in (1.102) (+4 -4)
+		debian/README.Debian (1.21) (+7 -7)
+		src/ghost/README (1.54) (+1 -1)
 
 	Prepare for 4.2 release
 
-2001-11-19	<rlk@sourceforge.net>
+2001-11-20	<rlk@sourceforge.net>
 
-	Files:	src/foomatic/Makefile.am (1.16) (+2 -2)
+	Files:	NEWS.4.2 (1.28) (+1 -2)
 
-	Rebuild Foomatic database if the printermap changes.  Reviewed by Till.
+	Combine 680 and 777
 
-2001-11-18	<sharkey@sourceforge.net>
+2001-11-19	<rlk@sourceforge.net>
 
-	Files:	acconfig.h (1.8.2.6) (+4 -1)
+	Files:	src/foomatic/Makefile.am (1.16) (+2 -2)
 
-	Update debian branch to RC1 and prep for Debian upload.
+	Rebuild Foomatic database if the printermap changes.  Reviewed by Till.
 
 2001-11-18	<rlk@sourceforge.net>
 
@@ -14493,16 +19164,20 @@
 
 2001-11-18	<rwisi@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-printermap (1.21) (+1 -0)
+	Files:	NEWS.4.2 (1.27) (+3 -2)
+		src/foomatic/foomatic-printermap (1.21) (+1 -0)
+		src/ghost/README (1.53) (+1 -0)
 		src/main/printers.xml (1.41) (+11 -1)
 
 	Added z43
 
 2001-11-18	<rlk@sourceforge.net>
 
-	Files:	po/da.po (1.13) (+1 -1)
+	Files:	configure.in.in (1.101) (+32 -25)
+		po/da.po (1.13) (+1 -1)
 		po/en_GB.po (1.79) (+2 -2)
 		po/fr.po (1.20) (+1 -1)
+		po/no.po (1.20) (+1 -1)
 		po/pl.po (1.4) (+1 -1)
 		po/sv.po (1.29) (+1 -1)
 		src/cups/Makefile.am (1.45) (+10 -13)
@@ -14520,6 +19195,18 @@
 
 2001-11-16	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.26) (+3 -0)
+
+	A bit more.
+
+2001-11-16	<rlk@sourceforge.net>
+
+	Files:	NEWS.4.2 (1.25) (+201 -203)
+
+	Tweaks
+
+2001-11-16	<rlk@sourceforge.net>
+
 	Files:	README (1.89) (+1 -1)
 
 	CUPS recommendation
@@ -14533,6 +19220,7 @@
 2001-11-14	<rlk@sourceforge.net>
 
 	Files:	README (1.87) (+13 -7)
+		src/ghost/README (1.52) (+22 -21)
 		src/main/print-escp2.c (1.146) (+3 -3)
 		src/main/printers.xml (1.40) (+3 -3)
 
@@ -14544,11 +19232,26 @@
 
 	481127 Epson 4pl printers too light at 2880
 
+2001-11-13	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.32) (+1 -1)
+
+	Update Debian revision number
+
+2001-11-12	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.31) (+5 -1)
+		debian/control.in (1.15) (+1 -0)
+		debian/rules (1.27) (+2 -2)
+
+	Update Debian packaging to use the latest configure options
+
 2001-11-12	<rlk@sourceforge.net>
 
 	Files:	po/da.po (1.12) (+94 -94)
 		po/en_GB.po (1.78) (+95 -95)
 		po/fr.po (1.19) (+94 -94)
+		po/no.po (1.19) (+94 -94)
 		po/pl.po (1.3) (+94 -94)
 		po/sv.po (1.28) (+94 -94)
 
@@ -14566,6 +19269,12 @@
 
 	Improve 2880x720.
 
+2001-11-11	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.100) (+1 -3)
+
+	Back out redundant GTK header fix
+
 2001-11-11	<rlk@sourceforge.net>
 
 	Files:	README (1.86) (+14 -0)
@@ -14578,11 +19287,26 @@
 
 	Make CUPS PPD files be level 2 by default
 
+2001-11-11	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.99) (+22 -1)
+
+	Make CUPS PPD's be level 2 by default.
+
+2001-11-10	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.98) (+8 -8)
+
+	Need to check for libz regardless of whether we're using cups-config
+	or not.
+
 2001-11-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.63) (+19 -1)
 		README (1.85) (+82 -9)
+		configure.in.in (1.97) (+14 -1)
 		src/cups/Makefile.am (1.44) (+34 -9)
+		src/ghost/README (1.51) (+11 -11)
 
 	Workaround for 470049 Multiple identical drivers in CUPS
 
@@ -14602,10 +19326,17 @@
 
 	Files:	src/escputil/Makefile.am (1.10) (+2 -2)
 		src/foomatic/Makefile.am (1.15) (+2 -2)
+		src/printdef/Makefile.am (1.8) (+2 -2)
 		test/Makefile.am (1.30) (+2 -2)
 
 	480357 Makefiles include GIMP_CFLAGS spuriously
 
+2001-11-10	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.96) (+3 -1)
+
+	Fix libgtk1.2 header inclusion with an extra configure check
+
 2001-11-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.62) (+0 -17)
@@ -14615,6 +19346,7 @@
 2001-11-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.61) (+33 -14)
+		NEWS.4.2 (1.24) (+21 -9)
 
 	Updates
 
@@ -14623,6 +19355,7 @@
 	Files:	po/da.po (1.11) (+121 -121)
 		po/en_GB.po (1.77) (+122 -122)
 		po/fr.po (1.18) (+458 -434)
+		po/no.po (1.18) (+121 -121)
 		po/pl.po (1.2) (+577 -577)
 		po/sv.po (1.27) (+121 -121)
 
@@ -14643,7 +19376,8 @@
 
 2001-11-08	<rlk@sourceforge.net>
 
-	Files:	doc/Makefile.am (1.27) (+10 -10)
+	Files:	configure.in.in (1.95) (+5 -1)
+		doc/Makefile.am (1.27) (+10 -10)
 		doc/users_guide/Makefile.am (1.28) (+11 -11)
 
 	Clean up rm use (many places need either -rm file or rm -f file):
@@ -14653,6 +19387,12 @@
 
 2001-11-08	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.50) (+1 -1)
+
+	Fix an error
+
+2001-11-08	<rlk@sourceforge.net>
+
 	Files:	src/main/print-lexmark.c (1.65) (+3 -3)
 
 	Strip trailing whitespace
@@ -14665,7 +19405,8 @@
 
 2001-11-08	<rlk@sourceforge.net>
 
-	Files:	po/pl.po (1.1) ( )
+	Files:	configure.in.in (1.94) (+2 -2)
+		po/pl.po (1.1) (added)
 
 	Add Polish translation
 
@@ -14674,6 +19415,7 @@
 	Files:	po/da.po (1.10) (+1 -1)
 		po/en_GB.po (1.76) (+15 -14)
 		po/fr.po (1.17) (+1 -1)
+		po/no.po (1.17) (+1 -1)
 		po/sv.po (1.26) (+1 -1)
 
 	Minor updates.
@@ -14686,9 +19428,16 @@
 
 2001-11-06	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/gimp-print.h.in (1.8) (+18 -14)
+
+	Comments
+
+2001-11-06	<rlk@sourceforge.net>
+
 	Files:	po/da.po (1.9) (+12 -12)
 		po/en_GB.po (1.74) (+13 -13)
 		po/fr.po (1.16) (+12 -12)
+		po/no.po (1.16) (+12 -12)
 		po/sv.po (1.25) (+12 -12)
 		src/cups/Makefile.am (1.43) (+2 -1)
 
@@ -14706,6 +19455,7 @@
 		po/da.po (1.8) (+12 -12)
 		po/en_GB.po (1.73) (+13 -13)
 		po/fr.po (1.15) (+12 -12)
+		po/no.po (1.15) (+12 -12)
 		po/sv.po (1.24) (+12 -12)
 		src/cups/Makefile.am (1.42) (+5 -11)
 		src/cups/genppd.c (1.34) (+6 -138)
@@ -14719,13 +19469,15 @@
 
 2001-11-03	<rlk@sourceforge.net>
 
-	Files:	README (1.84) (+141 -42)
+	Files:	NEWS.4.2 (1.23) (+0 -23)
+		README (1.84) (+141 -42)
 
 	Some more updates.
 
 2001-11-03	<rlk@sourceforge.net>
 
-	Files:	README (1.83) (+35 -12)
+	Files:	NEWS.4.2 (1.22) (+14 -3)
+		README (1.83) (+35 -12)
 
 	A few more updates for distributors, and about 2880x1440 resolution.
 
@@ -14750,17 +19502,22 @@
 2001-11-02	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.59) (+58 -29)
+		NEWS.4.2 (1.21) (+11 -6)
 		README (1.81) (+1 -1)
+		debian/README.Debian (1.20) (+7 -7)
 		po/da.po (1.7) (+38 -38)
 		po/en_GB.po (1.72) (+39 -39)
 		po/fr.po (1.14) (+38 -38)
+		po/no.po (1.14) (+38 -38)
 		po/sv.po (1.23) (+38 -38)
 
 	Minor updates
 
 2001-11-02	<rlk@sourceforge.net>
 
-	Files:	src/foomatic/foomatic-printermap (1.20) (+1 -0)
+	Files:	NEWS.4.2 (1.20) (+1 -0)
+		src/foomatic/foomatic-printermap (1.20) (+1 -0)
+		src/ghost/README (1.49) (+1 -0)
 		src/main/printers.xml (1.39) (+5 -5)
 
 	Finish adding Lexmark Z42
@@ -14787,12 +19544,24 @@
 
 2001-11-01	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.93) (+4 -1)
+
+	Support --with-readline=only
+
+2001-11-01	<rlk@sourceforge.net>
+
 	Files:	README (1.80) (+387 -287)
 
 	Add section on readline issues, and reorganize.
 
 2001-11-01	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.48) (+56 -31)
+
+	1440x1440 and 2880x720
+
+2001-11-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.142) (+5 -5)
 
 	Support 2880x1440 (!) on Stylus C80
@@ -14809,15 +19578,42 @@
 
 	Update from Mike
 
+2001-11-01	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.92) (+140 -62)
+
+	Try harder to link against libreadline (using -lncurses, -lcurses,
+	-ltermcap, and then just -lreadline), and supply a way for the
+	user to either turn off readline or request linking against specific
+	libraries.
+
+	Use cups-config if it exists.
+
 2001-10-31	<rleigh@sourceforge.net>
 
-	Files:	README (1.78) (+1 -1)
+	Files:	NEWS.4.2 (1.19) (+1 -1)
+		README (1.78) (+1 -1)
+		debian/changelog (1.30) (+1 -0)
+		debian/control.in (1.14) (+1 -1)
 
 	Update Debian packaging to Standards-Version 3.5.6.0
 
 2001-10-31	<rleigh@sourceforge.net>
 
-	Files:	README (1.77) (+9 -4)
+	Files:	debian/control.in (1.13) (+1 -1)
+
+	Update to Standards-Version 3.5.2 (really, this time!)
+
+2001-10-31	<rleigh@sourceforge.net>
+
+	Files:	NEWS.4.2 (1.18) (+1 -1)
+		README (1.77) (+9 -4)
+		configure.in.in (1.91) (+13 -12)
+		debian/README.Debian (1.19) (+4 -4)
+		debian/changelog (1.29) (+16 -3)
+		debian/control.in (1.12) (+6 -6)
+		debian/rules (1.26) (+2 -3)
+		src/ghost/README (1.47) (+12 -1)
 
 	Update Debian packaging to Standards-Version 3.5.2, and update package
 	descriptions and documentation for stable release.
@@ -14846,7 +19642,8 @@
 
 	Files:	doc/users_guide/.cvsignore (1.4) (+8 -8)
 		doc/users_guide/Makefile.am (1.26) (+6 -6)
-		doc/users_guide/users-guide.sgml (1.1) ( )
+		doc/users_guide/users-guide.sgml (1.1) (added)
+		doc/users_guide/users_guide.sgml (1.11) (removed)
 
 	Removed underscores from linkend, ids, and filename per Eric
 
@@ -14862,6 +19659,7 @@
 		po/da.po (1.6) (+1 -1)
 		po/en_GB.po (1.71) (+2 -2)
 		po/fr.po (1.13) (+1 -1)
+		po/no.po (1.13) (+1 -1)
 		po/sv.po (1.22) (+2 -2)
 		scripts/autogen.sh (1.16) (+2 -2)
 		src/main/print-escp2.c (1.141) (+3 -3)
@@ -14880,6 +19678,12 @@
 
 2001-10-28	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.90) (+2 -2)
+
+	Bump version
+
+2001-10-28	<rlk@sourceforge.net>
+
 	Files:	scripts/autogen.sh (1.15) (+25 -6)
 
 	Check libtool version; fix some URL's
@@ -14900,15 +19704,23 @@
 
 2001-10-28	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.17) (+79 -50)
+
+	Updates
+
+2001-10-28	<rlk@sourceforge.net>
+
 	Files:	doc/.cvsignore (1.6) (+15 -0)
 
 	More files to be ignored
 
 2001-10-28	<rlk@sourceforge.net>
 
-	Files:	po/da.po (1.5) (+94 -94)
+	Files:	configure.in.in (1.89) (+4 -1)
+		po/da.po (1.5) (+94 -94)
 		po/en_GB.po (1.70) (+13 -13)
 		po/fr.po (1.12) (+94 -94)
+		po/no.po (1.12) (+94 -94)
 		po/sv.po (1.21) (+95 -95)
 		src/cups/Makefile.am (1.40) (+12 -6)
 		src/cups/genppd.c (1.32) (+13 -2)
@@ -14924,6 +19736,14 @@
 
 	Minor fixes
 
+2001-10-28	<andystewart@sourceforge.net>
+
+	Files:	doc/users_guide/users_guide.sgml (1.10) (+20 -11)
+
+
+
+	Added <pubdate> so that the date would actually appear in ps and pdf output.
+
 2001-10-27	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.139) (+2 -2)
@@ -14933,15 +19753,37 @@
 2001-10-27	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.119) (+2 -2)
+		configure.in.in (1.88) (+2 -2)
+		debian/control.in (1.11) (+1 -1)
+		debian/copyright (1.4) (+1 -1)
 		doc/FAQ.html (1.7) (+3 -3)
 		doc/Makefile.am (1.24) (+2 -2)
 		doc/README.maintaining (1.8) (+16 -16)
+		doc/dither.texi (1.3) (+1 -1)
+		doc/escp2.texi (1.4) (+3 -3)
+		doc/functions.texi (1.6) (+1 -1)
+		doc/gimpprint.texi (1.6) (+3 -3)
+		doc/gpl.texi (1.2) (+2 -2)
+		doc/integrating.texi (1.2) (+2 -2)
+		doc/programs.texi (1.6) (+3 -3)
 		doc/users_guide/README (1.6) (+9 -10)
 		doc/users_guide/figures/README (1.3) (+1 -1)
+		doc/users_guide/users_guide.sgml (1.9) (+35 -35)
+		gimp.m4 (1.4) (+2 -2)
+		include/gimp-print/gimp-print.h.in (1.7) (+5 -5)
 		scripts/autogen.sh (1.14) (+2 -2)
+		scripts/gimp.m4 (1.2) (+2 -2)
 		src/cups/command.txt (1.2) (+1 -1)
 		src/cups/genppd.c (1.31) (+5 -5)
 		src/escputil/escputil.c (1.39) (+5 -5)
+		src/foomatic/foomatic-templates/ImageType.xml (1.3) (+3 -3)
+		src/foomatic/foomatic-templates/gimp-print.xml (1.2) (+1 -1)
+		src/ghost/README (1.46) (+9 -9)
+		src/ghost/README.bsd (1.2) (+5 -5)
+		src/ghost/debian-patch (1.3) (+3 -3)
+		src/ghost/gdevstp.c (1.14) (+2 -2)
+		src/main/gimpprint-config.in (1.5) (+2 -2)
+		src/main/gimpprint.m4 (1.6) (+5 -5)
 		src/main/print-canon.c (1.71) (+2 -2)
 		src/main/print-escp2.c (1.138) (+2 -2)
 		src/main/print-lexmark.c (1.61) (+90 -90)
@@ -14957,6 +19799,18 @@
 
 	Update en_GB translation escputil strings
 
+2001-10-27	<rlk@sourceforge.net>
+
+	Files:	NEWS.4.2 (1.16) (+12 -11)
+
+	Updates
+
+2001-10-27	<andystewart@sourceforge.net>
+
+	Files:	doc/users_guide/users_guide.sgml (1.8) (+7 -10)
+
+	Minor updates to reflect version 4.2
+
 2001-10-26	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.137) (+2 -3)
@@ -14968,12 +19822,19 @@
 	Files:	po/da.po (1.4) (+113 -113)
 		po/en_GB.po (1.68) (+114 -114)
 		po/fr.po (1.11) (+113 -113)
+		po/no.po (1.11) (+113 -113)
 		po/sv.po (1.20) (+114 -114)
 
 	Updates
 
 2001-10-25	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.15) (+2 -2)
+
+	Update Stylus C70/C80
+
+2001-10-25	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.58) (+11 -9)
 
 	Updates for beta-4
@@ -14995,6 +19856,7 @@
 	Files:	po/da.po (1.3) (+1 -1)
 		po/en_GB.po (1.67) (+2 -2)
 		po/fr.po (1.10) (+1 -1)
+		po/no.po (1.10) (+1 -1)
 		po/sv.po (1.19) (+2 -2)
 		src/main/print-escp2.c (1.135) (+26 -7)
 		src/main/printers.xml (1.35) (+4 -1)
@@ -15018,8 +19880,12 @@
 2001-10-24	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.56) (+59 -32)
+		NEWS.4.2 (1.14) (+19 -18)
 		README (1.75) (+16 -13)
+		debian/README.Debian (1.18) (+1 -1)
+		doc/users_guide/users_guide.sgml (1.7) (+1 -1)
 		src/cups/Makefile.am (1.39) (+2 -2)
+		src/ghost/README (1.45) (+0 -1)
 
 	Prep for beta-4.
 
@@ -15042,6 +19908,7 @@
 	Files:	po/da.po (1.2) (+1 -1)
 		po/en_GB.po (1.66) (+6 -9)
 		po/fr.po (1.9) (+1 -1)
+		po/no.po (1.9) (+1 -1)
 		po/sv.po (1.18) (+337 -121)
 
 	Updates
@@ -15074,15 +19941,34 @@
 2001-10-21	<rlk@sourceforge.net>
 
 	Files:	po/.cvsignore (1.7) (+1 -0)
-		po/da.po (1.1) ( )
+
+	Danish translation
+
+2001-10-21	<rlk@sourceforge.net>
+
+	Files:	doc/new-printer.texi (1.5) (+11 -2)
+
+	Updates
+
+2001-10-21	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.87) (+2 -2)
+		po/da.po (1.1) (added)
 		po/en_GB.po (1.65) (+2 -2)
 		po/fr.po (1.8) (+1 -1)
+		po/no.po (1.8) (+1 -1)
 		po/sv.po (1.17) (+2 -2)
 
 	Danish translation
 
 2001-10-21	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.86) (+32 -20)
+
+	Cleanup
+
+2001-10-21	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.131) (+2 -1)
 
 	Comment cleanup
@@ -15091,6 +19977,7 @@
 
 	Files:	po/en_GB.po (1.64) (+200 -113)
 		po/fr.po (1.7) (+85 -93)
+		po/no.po (1.7) (+85 -93)
 		po/sv.po (1.16) (+86 -104)
 
 	Updates
@@ -15101,6 +19988,18 @@
 
 	473849 Indexed images print incorrectly in color
 
+2001-10-21	<rlk@sourceforge.net>
+
+	Files:	doc/new-printer.texi (1.4) (+12 -12)
+
+	Capitalization
+
+2001-10-21	<rlk@sourceforge.net>
+
+	Files:	doc/new-printer.texi (1.3) (+205 -59)
+
+	Updates to Epson stuff.
+
 2001-10-20	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.130) (+148 -117)
@@ -15109,6 +20008,12 @@
 	less than 360x180).  Tested by comparing PPD files with and without
 	the change.
 
+2001-10-19	<rlk@sourceforge.net>
+
+	Files:	doc/users_guide/users_guide.sgml (1.6) (+2 -2)
+
+	typos
+
 2001-10-19	<rleigh@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.24) (+4 -3)
@@ -15117,6 +20022,21 @@
 
 2001-10-19	<rleigh@sourceforge.net>
 
+	Files:	debian/changelog (1.28) (+2 -1)
+		debian/control.in (1.10) (+14 -1)
+		debian/gimpprint-doc.doc-base (1.1) (added)
+		debian/rules (1.25) (+3 -1)
+
+	New package gimpprint-doc
+
+2001-10-19	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.85) (+1 -2)
+
+	Remove redundant gzip test, restoring make deb target
+
+2001-10-19	<rleigh@sourceforge.net>
+
 	Files:	test/Makefile.am (1.29) (+2 -2)
 
 	Disable run-weavetest dependency which breaks make dist
@@ -15137,6 +20057,7 @@
 
 	Files:	po/en_GB.po (1.63) (+5 -7)
 		po/fr.po (1.6) (+4 -6)
+		po/no.po (1.6) (+4 -6)
 		po/sv.po (1.15) (+5 -7)
 
 	Minor updates
@@ -15151,6 +20072,7 @@
 
 	Files:	po/en_GB.po (1.62) (+106 -182)
 		po/fr.po (1.5) (+113 -183)
+		po/no.po (1.5) (+113 -183)
 		po/sv.po (1.14) (+124 -186)
 
 	Updates
@@ -15197,13 +20119,13 @@
 
 2001-10-17	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.h (1.1) ( )
+	Files:	src/main/print-escp2.h (1.1) (added)
 
 	file print-escp2.h was initially added on branch split-escp2-branch.
 
 2001-10-17	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2-data.c (1.1) ( )
+	Files:	src/main/print-escp2-data.c (1.1) (added)
 
 	file print-escp2-data.c was initially added on branch split-escp2-branch.
 
@@ -15211,6 +20133,7 @@
 
 	Files:	po/en_GB.po (1.61) (+876 -3)
 		po/fr.po (1.4) (+1058 -156)
+		po/no.po (1.4) (+1054 -154)
 		po/sv.po (1.13) (+904 -3)
 		src/escputil/escputil.c (1.34) (+239 -226)
 
@@ -15218,8 +20141,10 @@
 
 2001-10-16	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.33) (+2 -1)
+	Files:	NEWS.4.2 (1.13) (+1 -0)
+		src/escputil/escputil.c (1.33) (+2 -1)
 		src/foomatic/foomatic-printermap (1.19) (+1 -0)
+		src/ghost/README (1.44) (+1 -0)
 		src/main/printers.xml (1.34) (+9 -1)
 
 	Preliminary support for Stylus Photo 820.
@@ -15236,12 +20161,20 @@
 
 	Files:	po/en_GB.po (1.60) (+97 -92)
 		po/fr.po (1.3) (+156 -199)
+		po/no.po (1.3) (+154 -197)
 		po/sv.po (1.12) (+41 -4)
 
 	Updates
 
 2001-10-16	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.12) (+1 -0)
+		src/ghost/README (1.43) (+1 -0)
+
+	Update for pcl-845
+
+2001-10-16	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.129) (+3 -3)
 
 	Don't use black ink on certain papers on C80.
@@ -15250,8 +20183,10 @@
 
 	Files:	po/en_GB.po (1.59) (+475 -389)
 		po/fr.po (1.2) (+199 -156)
+		po/no.po (1.2) (+197 -154)
 		po/sv.po (1.11) (+199 -155)
 		src/foomatic/foomatic-printermap (1.18) (+1 -0)
+		src/gimp/gimp_main_window.c (1.54) (+22 -22)
 		src/main/print-escp2.c (1.128) (+1172 -1218)
 
 	Mark one more message in gimp_main_window for internationalization.
@@ -15263,6 +20198,12 @@
 
 2001-10-15	<rleigh@sourceforge.net>
 
+	Files:	debian/changelog (1.27) (+2 -2)
+
+	New upstream release
+
+2001-10-15	<rleigh@sourceforge.net>
+
 	Files:	scripts/autogen.sh (1.11) (+2 -2)
 
 	Fix line wrapping
@@ -15309,8 +20250,10 @@
 
 2001-10-15	<rlk@sourceforge.net>
 
-	Files:	po/en_GB.po (1.57) (+335 -348)
-		po/fr.po (1.1) ( )
+	Files:	configure.in.in (1.84) (+3 -3)
+		po/en_GB.po (1.57) (+335 -348)
+		po/fr.po (1.1) (added)
+		po/no.po (1.1) (added)
 		po/sv.po (1.10) (+161 -554)
 		src/cups/Makefile.am (1.37) (+2 -2)
 
@@ -15365,6 +20308,7 @@
 
 	Files:	Makefile.am (1.116) (+10 -10)
 		doc/Makefile.am (1.19) (+17 -9)
+		doc/programs.texi (1.5) (+8 -0)
 		src/cups/Makefile.am (1.36) (+4 -4)
 		src/foomatic/Makefile.am (1.14) (+3 -3)
 
@@ -15393,6 +20337,12 @@
 
 	Add DESTDIR support to install-data-local and uninstall-local
 
+2001-10-13	<rlk@sourceforge.net>
+
+	Files:	doc/users_guide/users_guide.sgml (1.5) (+172 -83)
+
+	Some updates
+
 2001-10-12	<rlk@sourceforge.net>
 
 	Files:	doc/users_guide/.cvsignore (1.3) (+1 -0)
@@ -15408,8 +20358,10 @@
 
 2001-10-12	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.32) (+2 -1)
+	Files:	NEWS.4.2 (1.11) (+2 -1)
+		src/escputil/escputil.c (1.32) (+2 -1)
 		src/foomatic/foomatic-printermap (1.17) (+1 -0)
+		src/ghost/README (1.42) (+1 -0)
 		src/main/print-pcl.c (1.46) (+117 -42)
 		src/main/printers.xml (1.32) (+9 -1)
 
@@ -15430,19 +20382,29 @@
 2001-10-11	<rlk@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.19) (+11 -31)
+		doc/users_guide/users_guide.sgml (1.4) (+0 -48)
 
 	Eliminate dependency on specific Linux (much less UNIX) distribution.
 	Preprocess source rather than intermediate file.
 
 2001-10-11	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.18) (+21 -16)
+	Files:	configure.in.in (1.83) (+5 -1)
+		doc/users_guide/Makefile.am (1.18) (+21 -16)
+		doc/users_guide/users_guide.sgml (1.3) (+46 -46)
 
 	PDF users guide builds independently of PS docs.  Also, XREF and IMAGEDATA errors are gone.
 
+2001-10-11	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.41) (+6 -5)
+
+	Updates
+
 2001-10-10	<rlk@sourceforge.net>
 
-	Files:	src/gimp/Makefile.am (1.18) (+4 -5)
+	Files:	src/ghost/README (1.40) (+2 -2)
+		src/gimp/Makefile.am (1.18) (+4 -5)
 		src/main/print-escp2.c (1.126) (+75 -54)
 		src/main/printers.xml (1.31) (+2 -2)
 
@@ -15488,6 +20450,12 @@
 
 2001-10-07	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.10) (+8 -10)
+
+	Update for 4.1.99-b3
+
+2001-10-07	<rlk@sourceforge.net>
+
 	Files:	doc/users_guide/Makefile.am (1.16) (+12 -6)
 
 	Assorted minor cleanup and bug fixing.
@@ -15507,7 +20475,8 @@
 
 2001-10-07	<rlk@sourceforge.net>
 
-	Files:	po/en_GB.po (1.54) (+1 -1)
+	Files:	po/ChangeLog (1.9) (removed)
+		po/en_GB.po (1.54) (+1 -1)
 		po/sv.po (1.7) (+2 -2)
 		scripts/autogen.sh (1.10) (+9 -0)
 
@@ -15526,6 +20495,7 @@
 2001-10-06	<andystewart@sourceforge.net>
 
 	Files:	doc/users_guide/Makefile.am (1.15) (+1 -7)
+		po/ChangeLog (1.8) (+4 -0)
 
 	Removed creation of figures directory in users_guide pdf and eps targets
 
@@ -15533,21 +20503,30 @@
 
 	Files:	doc/users_guide/Makefile.am (1.14) (+6 -21)
 		doc/users_guide/README (1.4) (+2 -2)
+		po/ChangeLog (1.7) (+75 -0)
 		scripts/autogen.sh (1.9) (+27 -11)
 
 	Tweaked doc/users_guide/Makefile.am and added checks for convert and docbook_4 to scripts/autogen.sh
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/.cvsignore (1.1) ( )
+	Files:	doc/users_guide/.cvsignore (1.1) (added)
 		doc/users_guide/Makefile.am (1.13) (+6 -1)
-		doc/users_guide/figures/.cvsignore (1.1) ( )
+		doc/users_guide/figures/.cvsignore (1.1) (added)
 
 	Updates
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.12) (+31 -24)
+	Files:	doc/users_guide/users_guide.sgml (1.2) (+8 -8)
+
+	Some cleanup
+
+2001-10-06	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.82) (+18 -1)
+		doc/users_guide/Makefile.am (1.12) (+31 -24)
+		po/ChangeLog (1.6) (+20 -0)
 
 	Add -without-user-guide.
 
@@ -15561,9 +20540,12 @@
 
 	Files:	AUTHORS (1.10) (+3 -0)
 		NEWS (1.55) (+61 -41)
+		NEWS.4.2 (1.9) (+8 -2)
+		po/ChangeLog (1.5) (+48 -0)
 		po/en_GB.po (1.53) (+21 -21)
 		po/sv.po (1.6) (+2420 -1998)
 		scripts/autogen.sh (1.8) (+148 -0)
+		src/ghost/README (1.39) (+8 -4)
 
 	Update some more documentation.
 
@@ -15610,6 +20592,12 @@
 
 2001-10-06	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.81) (+2 -1)
+
+	Look for ps2pdf for documentation.
+
+2001-10-06	<rlk@sourceforge.net>
+
 	Files:	src/foomatic/foomatic-printermap (1.16) (+3 -0)
 
 	Add BJC-210, 240, and 250.
@@ -15647,22 +20635,47 @@
 
 2001-10-04	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.6) (+2 -3)
+	Files:	doc/users_guide/Makefile (1.3) (removed)
+		doc/users_guide/Makefile.am (1.6) (+2 -3)
 
 	Removing Makefile as it is now built by automake
 
 2001-10-04	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.5) (+3 -3)
+	Files:	doc/users_guide/Makefile (1.2) (+373 -80)
+		doc/users_guide/Makefile.am (1.5) (+3 -3)
 		doc/users_guide/README (1.3) (+8 -0)
 
 	*** empty log message ***
 
 2001-10-04	<andystewart@sourceforge.net>
 
+	Files:	doc/users_guide/figures/cups_admin.eps (1.2) (removed)
+		doc/users_guide/figures/cups_admin_device.eps (1.2) (removed)
+		doc/users_guide/figures/cups_admin_make.eps (1.2) (removed)
+		doc/users_guide/figures/cups_admin_model.eps (1.2) (removed)
+		doc/users_guide/figures/cups_admin_success.eps (1.2) (removed)
+		doc/users_guide/figures/cups_config_printer.eps (1.2) (removed)
+		doc/users_guide/figures/cups_my_printer.eps (1.2) (removed)
+		doc/users_guide/figures/cups_printers.eps (1.2) (removed)
+		doc/users_guide/figures/cups_startup.eps (1.2) (removed)
+		doc/users_guide/figures/gimp-print-gui-1.eps (1.2) (removed)
+		doc/users_guide/figures/gimp-print-gui.eps (1.2) (removed)
+		doc/users_guide/figures/gimp-print-new-printer.eps (1.2) (removed)
+		doc/users_guide/figures/gimp-print-print-color-adjust.eps (1.2) (removed)
+		doc/users_guide/figures/gimp-print-setup.eps (1.2) (removed)
+		doc/users_guide/figures/gimp_image.eps (1.2) (removed)
+		doc/users_guide/figures/gimp_startup.eps (1.2) (removed)
+
+	Removing EPS files as they are now machine generated
+
+2001-10-04	<andystewart@sourceforge.net>
+
 	Files:	doc/users_guide/Makefile.am (1.4) (+13 -28)
 		doc/users_guide/README (1.2) (+12 -14)
 		doc/users_guide/figures/README (1.2) (+5 -7)
+		doc/users_guide/gimp-print-users-guide-4.1.99-b3.sgml (1.2) (removed)
+		doc/users_guide/users_guide.sgml (1.1) (added)
 
 	Updates to Makefile.am, READMEs, and rename orig source file to remove rev
 
@@ -15675,6 +20688,7 @@
 2001-10-03	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.113) (+6 -6)
+		configure.in.in (1.80) (+7 -7)
 		doc/Makefile.am (1.17) (+4 -4)
 		doc/users_guide/Makefile.am (1.3) (+4 -4)
 
@@ -15682,7 +20696,8 @@
 
 2001-10-03	<rleigh@sourceforge.net>
 
-	Files:	doc/Makefile.am (1.16) (+3 -1)
+	Files:	configure.in.in (1.79) (+2 -1)
+		doc/Makefile.am (1.16) (+3 -1)
 		doc/users_guide/Makefile.am (1.2) (+54 -13)
 
 	Add users_guide to doc/Makefile.am SUBDIRS
@@ -15698,7 +20713,8 @@
 
 2001-10-02	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.1) ( )
+	Files:	configure.in.in (1.78) (+7 -2)
+		doc/users_guide/Makefile.am (1.1) (added)
 
 	Add preliminary support for the new SGML user guide
 
@@ -15710,39 +20726,61 @@
 
 2001-10-02	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/README (1.1) ( )
-		doc/users_guide/figures/README (1.1) ( )
-		doc/users_guide/figures/cups_admin.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_device.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_make.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_model.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_success.png (1.1) ( )
-		doc/users_guide/figures/cups_config_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_my_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_printers.png (1.1) ( )
-		doc/users_guide/figures/cups_startup.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui-1.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-new-printer.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-print-color-adjust.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-setup.png (1.1) ( )
-		doc/users_guide/figures/gimp_image.png (1.1) ( )
-		doc/users_guide/figures/gimp_startup.png (1.1) ( )
+	Files:	doc/users_guide/Makefile (1.1) (added)
+		doc/users_guide/README (1.1) (added)
+		doc/users_guide/figures/README (1.1) (added)
+		doc/users_guide/figures/cups_admin.eps (1.1) (added)
+		doc/users_guide/figures/cups_admin.png (1.1) (added)
+		doc/users_guide/figures/cups_admin_device.eps (1.1) (added)
+		doc/users_guide/figures/cups_admin_device.png (1.1) (added)
+		doc/users_guide/figures/cups_admin_make.eps (1.1) (added)
+		doc/users_guide/figures/cups_admin_make.png (1.1) (added)
+		doc/users_guide/figures/cups_admin_model.eps (1.1) (added)
+		doc/users_guide/figures/cups_admin_model.png (1.1) (added)
+		doc/users_guide/figures/cups_admin_success.eps (1.1) (added)
+		doc/users_guide/figures/cups_admin_success.png (1.1) (added)
+		doc/users_guide/figures/cups_config_printer.eps (1.1) (added)
+		doc/users_guide/figures/cups_config_printer.png (1.1) (added)
+		doc/users_guide/figures/cups_my_printer.eps (1.1) (added)
+		doc/users_guide/figures/cups_my_printer.png (1.1) (added)
+		doc/users_guide/figures/cups_printers.eps (1.1) (added)
+		doc/users_guide/figures/cups_printers.png (1.1) (added)
+		doc/users_guide/figures/cups_startup.eps (1.1) (added)
+		doc/users_guide/figures/cups_startup.png (1.1) (added)
+		doc/users_guide/figures/gimp-print-gui-1.eps (1.1) (added)
+		doc/users_guide/figures/gimp-print-gui-1.png (1.1) (added)
+		doc/users_guide/figures/gimp-print-gui.eps (1.1) (added)
+		doc/users_guide/figures/gimp-print-gui.png (1.1) (added)
+		doc/users_guide/figures/gimp-print-new-printer.eps (1.1) (added)
+		doc/users_guide/figures/gimp-print-new-printer.png (1.1) (added)
+		doc/users_guide/figures/gimp-print-print-color-adjust.eps (1.1) (added)
+		doc/users_guide/figures/gimp-print-print-color-adjust.png (1.1) (added)
+		doc/users_guide/figures/gimp-print-setup.eps (1.1) (added)
+		doc/users_guide/figures/gimp-print-setup.png (1.1) (added)
+		doc/users_guide/figures/gimp_image.eps (1.1) (added)
+		doc/users_guide/figures/gimp_image.png (1.1) (added)
+		doc/users_guide/figures/gimp_startup.eps (1.1) (added)
+		doc/users_guide/figures/gimp_startup.png (1.1) (added)
+		doc/users_guide/gimp-print-users-guide-4.1.99-b3.sgml (1.1) (added)
 
 	Initial checkin of user's guide
 
 2001-10-02	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.31) (+2 -1)
+	Files:	NEWS.4.2 (1.8) (+1 -0)
+		src/escputil/escputil.c (1.31) (+2 -1)
 		src/foomatic/foomatic-printermap (1.15) (+1 -0)
+		src/ghost/README (1.38) (+3 -1)
 		src/main/printers.xml (1.29) (+9 -1)
 
 	Support for Stylus Scan 2000 (really a Stylus Color 740 inside).
 
 2001-10-01	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.30) (+3 -1)
+	Files:	NEWS.4.2 (1.7) (+2 -0)
+		src/escputil/escputil.c (1.30) (+3 -1)
 		src/foomatic/foomatic-printermap (1.14) (+2 -0)
+		src/ghost/README (1.37) (+2 -0)
 		src/main/printers.xml (1.28) (+17 -1)
 
 	Nominal support for Epson Stylus C70 and Photo 810.
@@ -15780,7 +20818,9 @@
 
 2001-10-01	<rlk@sourceforge.net>
 
-	Files:	src/escputil/escputil.c (1.29) (+2 -1)
+	Files:	NEWS.4.2 (1.6) (+12 -11)
+		src/escputil/escputil.c (1.29) (+2 -1)
+		src/ghost/README (1.36) (+315 -304)
 		src/main/print-escp2.c (1.122) (+91 -71)
 		src/main/print-util.c (1.50) (+6 -6)
 
@@ -15818,6 +20858,12 @@
 
 2001-09-29	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.35) (+10 -4)
+
+	Clarification
+
+2001-09-29	<rlk@sourceforge.net>
+
 	Files:	test/unprint.c (1.22) (+64 -61)
 
 	More cleanup
@@ -15828,6 +20874,14 @@
 
 	Updates
 
+2001-09-27	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.26) (+8 -0)
+		debian/cupsys-driver-gimpprint.files (1.5) (+2 -1)
+
+	Update version number
+	Only use C locale ppd files due to their large size
+
 2001-09-25	<rlk@sourceforge.net>
 
 	Files:	src/testpattern/testpattern.c (1.5) (+5 -1)
@@ -15846,15 +20900,45 @@
 
 	Files:	NEWS (1.54) (+22 -1)
 		README (1.72) (+1 -1)
+		configure.in.in (1.77) (+2 -2)
+		debian/README.Debian (1.17) (+1 -1)
+		src/ghost/README (1.34) (+2 -2)
 
 	Bump version.
 
 2001-09-24	<rlk@sourceforge.net>
 
+	Files:	po/ChangeLog (1.4) (+6 -0)
+
+	Make Makefile.in.in happy.
+
+2001-09-24	<rlk@sourceforge.net>
+
 	Files:	scripts/autogen.sh (1.7) (+16 -9)
 
 	Require gettext 0.10.38 or higher.
 
+2001-09-24	<mitsch@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.53) (+7 -5)
+
+	Align the "Adjust Output..." button with the output type radio buttons.
+
+2001-09-24	<mitsch@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.19) (+185 -189)
+		src/gimp/gimp_main_window.c (1.52) (+1165 -989)
+
+	General GIMP Plug-In GUI cleanup:
+
+	- fixed gimp_help_set_help_data() usage.
+	- some more gimp_table_attach_aligned() instead of manual attaching.
+	- added a notebook for "printer" and "image/output" options.
+	- changed order of widgets in the "position" frame.
+	- re-packed the "scaling" frame (and renamed it to "size").
+	- general spacing/indentation style unification.
+	- stuff...
+
 2001-09-24	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.54) (+25 -20)
@@ -15864,8 +20948,11 @@
 
 2001-09-24	<rlk@sourceforge.net>
 
-	Files:	po/sv.po (1.1) ( )
+	Files:	NEWS.4.2 (1.5) (+33 -24)
+		configure.in.in (1.76) (+2 -2)
+		po/sv.po (1.1) (added)
 		src/foomatic/foomatic-printermap (1.13) (+1 -0)
+		src/ghost/gdevstp.c (1.13) (+70 -33)
 		src/main/print-escp2.c (1.121) (+168 -6)
 		src/main/printers.xml (1.26) (+9 -1)
 
@@ -15879,6 +20966,18 @@
 	specified.  The problem was fairly involved.  The fix builds on
 	Richard Wisenoecker's fix from earlier today.
 
+2001-09-23	<rwisi@sourceforge.net>
+
+	Files:	src/ghost/gdevstp.c (1.12) (+49 -13)
+
+	Corrected problem with ignored user parameters at the method stp_put_params().
+
+2001-09-22	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.51) (+3 -3)
+
+	Empty strings should not be marked for translation.
+
 2001-09-21	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.50) (+80 -80)
@@ -15893,6 +20992,12 @@
 
 2001-09-21	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.33) (+7 -6)
+
+	Sync up with most current reality.
+
+2001-09-21	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.120) (+7 -7)
 
 	Fix Stylus Color 660.
@@ -15966,9 +21071,20 @@
 
 2001-09-18	<rleigh@sourceforge.net>
 
-	Files:	doc/.cvsignore (1.5) (+3 -0)
+	Files:	debian/README.Debian (1.16) (+4 -2)
+		debian/README.building (1.3) (+20 -3)
+		debian/changelog (1.25) (+6 -2)
+		debian/control.in (1.9) (+1 -0)
+		debian/gimp1.2-print.doc-base (1.4) (removed)
+		debian/gimp1.2-print.docs (1.5) (+0 -2)
+		debian/rules (1.24) (+7 -3)
+		doc/.cvsignore (1.5) (+3 -0)
 		doc/Makefile.am (1.15) (+2 -4)
 		doc/README.maintaining (1.6) (+9 -1)
+		doc/docbook.css (1.2) (removed)
+		doc/print.html (1.2) (removed)
+		doc/print.sgml (1.2) (removed)
+		doc/programs.texi (1.4) (+0 -6)
 
 	Add images to HTML manual
 	Remove duplicated information in SGML/HTML files
@@ -15983,7 +21099,8 @@
 
 2001-09-18	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.117) (+2 -2)
+	Files:	src/ghost/README (1.32) (+6 -7)
+		src/main/print-escp2.c (1.117) (+2 -2)
 
 	The SC660 probably isn't too happy doing microweave either.
 
@@ -16003,6 +21120,7 @@
 
 	Files:	.cvsignore (1.15) (+1 -0)
 		Makefile.am (1.111) (+11 -6)
+		doc/texinfo.tex (1.2) (removed)
 		po/en_GB.po (1.49) (+99 -143)
 		src/cups/Makefile.am (1.35) (+3 -2)
 		src/foomatic/Makefile.am (1.13) (+3 -2)
@@ -16016,8 +21134,11 @@
 
 2001-09-17	<rleigh@sourceforge.net>
 
-	Files:	doc/Makefile.am (1.14) (+8 -0)
-		scripts/epsf.tex (1.1) ( )
+	Files:	configure.in.in (1.75) (+2 -1)
+		doc/Makefile.am (1.14) (+8 -0)
+		doc/programs.texi (1.3) (+27 -20)
+		scripts/epsf.tex (1.1) (added)
+		scripts/texinfo.tex (1.1) (added)
 
 	Added images to texinfo documentation (dvi/ps format only at this time)
 
@@ -16053,6 +21174,24 @@
 
 2001-09-16	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/gimp-print.h.in (1.6) (+0 -0)
+
+	Try yet again to fix the ID string!
+
+2001-09-16	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.5) (+2 -2)
+
+	Try again to fix the ID string.
+
+2001-09-16	<rlk@sourceforge.net>
+
+	Files:	include/gimp-print/gimp-print.h.in (1.4) (+2 -2)
+
+	Fix CVS ID string
+
+2001-09-16	<rlk@sourceforge.net>
+
 	Files:	test/unprint.c (1.19) (+39 -58)
 
 	Simplify, and try (if not entirely successfully) to improve performance.
@@ -16060,6 +21199,8 @@
 2001-09-16	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.13) (+8 -5)
+		doc/introduction.texi (1.4) (+1 -0)
+		doc/programs.texi (1.2) (+250 -3)
 
 	Add print plugin documentation
 
@@ -16091,6 +21232,8 @@
 
 	Files:	src/escputil/escputil.c (1.26) (+2 -1)
 		src/foomatic/foomatic-printermap (1.11) (+1 -0)
+		src/ghost/README (1.31) (+229 -234)
+		src/main/print-dither.c (1.44) (+20 -14)
 		src/main/print-escp2.c (1.113) (+129 -140)
 		src/main/printers.xml (1.24) (+9 -1)
 
@@ -16100,12 +21243,18 @@
 
 	Some reorg of Epson densities/drop sizes (mostly to make it easier to read)
 
-2001-09-14	<sharkey@sourceforge.net>
+2001-09-11	<rlk@sourceforge.net>
 
-	Files:	acconfig.h (1.8.2.5) (+5 -36)
+	Files:	src/ghost/README (1.30) (+3 -4)
 
-	Merge in main trunk changes to bring the debian branch up to the beta1
-	release.
+	Typo
+
+2001-09-10	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.24) (+5 -2)
+		debian/control.in (1.8) (+1 -1)
+
+	Add gettext Build-Depends as we need DESTDIR support
 
 2001-09-09	<rlk@sourceforge.net>
 
@@ -16124,6 +21273,8 @@
 
 	Files:	Makefile.am (1.110) (+25 -6)
 		README (1.71) (+7 -8)
+		configure.in.in (1.74) (+16 -8)
+		debian/README.building (1.2) (+35 -14)
 		po/POTFILES.in (1.10) (+5 -0)
 		po/en_GB.po (1.48) (+77 -77)
 		src/Makefile.am (1.7) (+4 -3)
@@ -16141,6 +21292,7 @@
 2001-09-08	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.48) (+25 -3)
+		src/ghost/README (1.29) (+57 -79)
 		src/main/print-escp2.c (1.112) (+34 -39)
 
 	Reorganize the Epson Stylus resolutions.
@@ -16163,16 +21315,34 @@
 
 2001-09-08	<rleigh@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.4) (+3 -2)
+
+	Amend Debian notes
+
+2001-09-08	<rleigh@sourceforge.net>
+
 	Files:	Makefile.am (1.109) (+2 -2)
 
 	Oder SUBDIRS according to gettext specifications i.e. po is last
 
+2001-09-08	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-intl-internal.h (1.3) (removed)
+
+	Remove intended file.
+
 2001-09-08	<rleigh@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.27) (+4 -2)
 
 	Add comments to ambiguous translatable strings
 
+2001-09-08	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-internal.h (1.43) (+0 -0)
+
+	Restore accidentally deleted file.
+
 2001-09-08	<rleigh@sourceforge.net>
 
 	Files:	src/gimp/print-intl.h (1.2) (+3 -29)
@@ -16192,9 +21362,11 @@
 2001-09-08	<rleigh@sourceforge.net>
 
 	Files:	src/main/Makefile.am (1.26) (+1 -2)
+		src/main/gimp-print-internal.h (1.42) (removed)
 		src/main/print-canon.c (1.67) (+3 -3)
 		src/main/print-color.c (1.24) (+3 -3)
 		src/main/print-dither-matrices.c (1.4) (+2 -2)
+		src/main/print-dither.c (1.43) (+3 -3)
 		src/main/print-escp2.c (1.111) (+3 -3)
 		src/main/print-lexmark.c (1.53) (+3 -3)
 		src/main/print-pcl.c (1.44) (+3 -3)
@@ -16205,12 +21377,50 @@
 
 	All source uses the new i18n header in include/gimp-print
 
+2001-09-08	<rleigh@sourceforge.net>
+
+	Files:	include/gimp-print/Makefile.am (1.2) (+2 -2)
+		include/gimp-print/gimp-print-intl-internal.h (1.1) (added)
+		include/gimp-print/gimp-print-intl.h (1.2) (+4 -4)
+		include/gimp-print/gimp-print.h.in (1.3) (+5 -5)
+
+	Add internal i18n header and fix header #defines
+
+2001-09-08	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.23) (+3 -2)
+		debian/libgimpprint.files (1.6) (+1 -0)
+		debian/rules (1.23) (+2 -2)
+
+	Use gettext for i18n
+
+2001-09-08	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.73) (+4 -3)
+
+	Fixed AC_OUTPUT order (VPATH build was broken)
+
+2001-09-08	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.50) (+8 -8)
+
+	Clean up the printer scroller, based on suggestion from Eduardo Perez.
+
+2001-09-07	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.72) (+2 -2)
+
+	Minor typo
+
 2001-09-07	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.47) (+10 -1)
 		README (1.70) (+1 -1)
+		configure.in.in (1.71) (+2 -2)
+		debian/README.Debian (1.15) (+1 -1)
 		po/.cvsignore (1.3) (+0 -1)
 		po/en_GB.po (1.46) (+115 -91)
+		src/ghost/README (1.28) (+265 -186)
 		src/main/print-escp2.c (1.110) (+98 -68)
 
 	Add 360x180 and 360x240 draft modes for Epson Stylus printers.
@@ -16219,6 +21429,13 @@
 
 	Bump the version.
 
+2001-09-07	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.70) (+2 -2)
+		po/en_TEST.po (1.46) (removed)
+
+	Remove the en_TEST translation
+
 2001-09-06	<rlk@sourceforge.net>
 
 	Files:	src/main/print-util.c (1.46) (+7 -6)
@@ -16227,7 +21444,9 @@
 
 2001-09-06	<easysw@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.32) (+14 -12)
+	Files:	configure.in.in (1.69) (+52 -9)
+		cups-gimpprint.list.in (1.1) (added)
+		src/cups/Makefile.am (1.32) (+14 -12)
 		src/cups/genppd.c (1.26) (+83 -54)
 
 	Fix default CFLAGS bug and re-add --enable-debug.  Otherwise everything
@@ -16245,8 +21464,17 @@
 
 2001-09-05	<rlk@sourceforge.net>
 
+	Files:	include/gimp-print/gimp-print.h.in (1.2) (+118 -16)
+
+	Add comments.
+
+2001-09-05	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.46) (+0 -1)
 		po/en_GB.po (1.45) (+342 -68)
+		po/en_TEST.po (1.45) (+343 -68)
+		src/gimp/gimp_color_window.c (1.18) (+66 -66)
+		src/gimp/gimp_main_window.c (1.49) (+202 -188)
 		src/gimp/print_gimp.h (1.20) (+2 -4)
 
 	Convert from GTK tooltips to Gimp tooltips.
@@ -16256,6 +21484,7 @@
 2001-09-03	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.44) (+1 -1)
+		po/en_TEST.po (1.44) (+1 -1)
 
 	Updates
 
@@ -16273,7 +21502,14 @@
 
 2001-09-03	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.27) (+0 -1)
+
+	Canon printers do not support 180 DPI.
+
+2001-09-03	<rlk@sourceforge.net>
+
 	Files:	po/en_GB.po (1.43) (+1 -1)
+		po/en_TEST.po (1.43) (+1 -1)
 
 	Final 4.1.99-b1 updates.
 
@@ -16292,19 +21528,31 @@
 2001-09-02	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.108) (+2 -2)
-		include/.cvsignore (1.1) ( )
-		include/Makefile.am (1.1) ( )
+		configure.in.in (1.68) (+9 -9)
+		include/.cvsignore (1.1) (added)
+		include/Makefile.am (1.1) (added)
+		include/gimp-print/.cvsignore (1.1) (added)
+		include/gimp-print/Makefile.am (1.1) (added)
+		include/gimp-print/gimp-print-intl.h (1.1) (added)
+		include/gimp-print/gimp-print.h.in (1.1) (added)
 		src/Makefile.am (1.6) (+2 -2)
 		src/cups/genppd.c (1.25) (+4 -4)
 		src/cups/rastertoprinter.c (1.19) (+3 -3)
+		src/foomatic/gimp-print-version.c (1.2) (+2 -2)
 		src/foomatic/paper_sizes.c (1.4) (+2 -2)
 		src/foomatic/printer_options.c (1.9) (+2 -2)
 		src/foomatic/printers.c (1.2) (+2 -2)
+		src/foomatic/stp_limits.c (1.2) (+2 -2)
 		src/ghost/Makefile.am (1.14) (+2 -2)
 		src/gimp/print_gimp.h (1.19) (+2 -2)
+		src/include/.cvsignore (1.3) (removed)
+		src/include/Makefile.am (1.9) (removed)
+		src/include/gimp-print-intl.h (1.2) (removed)
+		src/include/gimp-print.h.in (1.20) (removed)
 		src/main/print-canon.c (1.66) (+2 -2)
 		src/main/print-color.c (1.23) (+2 -2)
 		src/main/print-dither-matrices.c (1.3) (+2 -2)
+		src/main/print-dither.c (1.42) (+2 -2)
 		src/main/print-escp2.c (1.109) (+2 -2)
 		src/main/print-lexmark.c (1.52) (+2 -2)
 		src/main/print-pcl.c (1.43) (+2 -2)
@@ -16327,7 +21575,13 @@
 
 2001-09-01	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.42) (+114 -107)
+	Files:	configure.in.in (1.67) (+2 -2)
+		debian/changelog (1.22) (+10 -1)
+		debian/control.in (1.7) (+3 -3)
+		debian/rules (1.22) (+9 -6)
+		doc/functions.texi (1.5) (+2 -2)
+		po/en_GB.po (1.42) (+114 -107)
+		po/en_TEST.po (1.42) (+114 -107)
 		src/main/Makefile.am (1.25) (+1 -2)
 		src/testpattern/Makefile.am (1.4) (+2 -1)
 
@@ -16348,10 +21602,21 @@
 
 2001-08-30	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.66) (+2 -2)
+
+	Require Gimp 1.2.
+
+2001-08-30	<rlk@sourceforge.net>
+
 	Files:	AUTHORS (1.9) (+1 -0)
 		NEWS (1.43) (+37 -1)
+		NEWS.4.2 (1.3) (+21 -23)
 		README (1.69) (+2 -2)
+		configure.in.in (1.65) (+3 -3)
+		debian/README.Debian (1.14) (+1 -1)
 		po/en_GB.po (1.41) (+276 -284)
+		po/en_TEST.po (1.41) (+294 -292)
+		src/ghost/README (1.26) (+24 -21)
 		src/main/Makefile.am (1.24) (+7 -7)
 
 	Bump version.
@@ -16364,6 +21629,12 @@
 
 2001-08-30	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.48) (+2 -2)
+
+	Change "Adjust color" to more accurate "Adjust output"
+
+2001-08-30	<rlk@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.44) (+41 -90)
 
 	Clean up parameter verification.
@@ -16376,6 +21647,18 @@
 
 2001-08-29	<rlk@sourceforge.net>
 
+	Files:	NEWS.4.2 (1.2) (+57 -55)
+
+	Minor tweaks
+
+2001-08-29	<rlk@sourceforge.net>
+
+	Files:	NEWS.4.2 (1.1) (added)
+
+	First cut at 4.2 release notes
+
+2001-08-29	<rlk@sourceforge.net>
+
 	Files:	po/POTFILES.in (1.8) (+0 -6)
 
 	Don't translate test sources.
@@ -16386,6 +21669,14 @@
 
 	Fix handling of parameters from Gimp scripts
 
+2001-08-28	<rleigh@sourceforge.net>
+
+	Files:	lib/libprintut.h (1.6) (+3 -1)
+		src/main/gimp-print-intl-internal.h (1.2) (+3 -3)
+
+	Correct getopt header inclusion if libc provides getopt
+	Use PACKAGE instead of "gimp-print" for gettext domain name
+
 2001-08-28	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.107) (+7 -5)
@@ -16427,8 +21718,11 @@
 
 2001-08-25	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.106) (+112 -79)
+	Files:	src/ghost/README (1.25) (+28 -13)
+		src/ghost/gdevstp.c (1.11) (+17 -3)
+		src/main/print-escp2.c (1.106) (+112 -79)
 		src/main/print-util.c (1.43) (+2 -2)
+		src/printdef/printdefy.y (1.7) (+2 -2)
 
 	Support allowing different margins depending upon the printer
 	parameters, such as quality settings.  Some Epson printers allow
@@ -16446,7 +21740,7 @@
 	Files:	src/foomatic/Makefile.am (1.12) (+9 -3)
 		src/foomatic/foomatic-generator.in (1.12) (+22 -10)
 		src/foomatic/printer_options.c (1.7) (+7 -5)
-		src/foomatic/printers.c (1.1) ( )
+		src/foomatic/printers.c (1.1) (added)
 
 	Cleanup from namestring changes in alpha-3.
 
@@ -16472,14 +21766,54 @@
 	Change default 360 DPI mode to microweave on printers that
 	support it, for better quality.
 
+2001-08-23	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.17) (+1 -2)
+		src/gimp/gimp_main_window.c (1.47) (+12 -5)
+
+	Disable tooltips while using the preview window (very distracting
+	to move the mouse around while the huge tooltip is in your face).
+
+2001-08-23	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.46) (+26 -28)
+
+	Clean up some of the dialogs a bit more.
+
+2001-08-23	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.45) (+25 -42)
+
+	More cleanup
+
+2001-08-22	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.44) (+13 -16)
+
+	More cleanup
+
 2001-08-22	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.18) (+3 -4)
+	Files:	src/gimp/gimp_main_window.c (1.43) (+58 -79)
+
+	Smooth drawing even more.
+
+2001-08-22	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.16) (+9 -1)
+		src/gimp/gimp_main_window.c (1.42) (+246 -120)
+		src/gimp/print_gimp.h (1.18) (+3 -4)
 
 	Reduce flashing in the GUI.
 
 2001-08-21	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.41) (+53 -1)
+
+	Add about dialog
+
+2001-08-21	<rlk@sourceforge.net>
+
 	Files:	src/escputil/escputil.c (1.25) (+8 -7)
 
 	-u isn't for USB, it's for new printer.
@@ -16496,6 +21830,12 @@
 
 	Handle resolutions correctly (without trying to parse them)
 
+2001-08-20	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.40) (+3 -2)
+
+	Try yet again to position the printer crawler correctly.
+
 2001-08-20	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.50) (+37 -18)
@@ -16505,7 +21845,10 @@
 2001-08-19	<rlk@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.12) (+3 -3)
+		src/gimp/gimp_color_window.c (1.15) (+75 -3)
+		src/gimp/gimp_main_window.c (1.39) (+260 -22)
 		src/gimp/print_gimp.h (1.17) (+5 -1)
+		src/include/gimp-print.h.in (1.19) (+4 -3)
 		src/main/print-canon.c (1.65) (+8 -4)
 		src/main/print-escp2.c (1.104) (+126 -93)
 		src/main/print-lexmark.c (1.49) (+8 -4)
@@ -16553,6 +21896,19 @@
 	-different head offsets at black
 	 I changed the head_offset entries at lexmark_cap_t to two entries. One for standard cartridge and one for photo cartridge. This should reduce the confusion. These offsets are different because the top position of the black ink is different at photo and black cartridge.
 
+2001-08-18	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.38) (+32 -17)
+
+	Adapted suggestions from Kurt Pfeifle
+
+2001-08-16	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.37) (+4 -2)
+
+	Printer list name needs to match text for gimp_plist_callback to work
+	correctly.
+
 2001-08-14	<rlk@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.31) (+4 -3)
@@ -16564,6 +21920,7 @@
 	Files:	NEWS (1.42) (+64 -31)
 		README (1.68) (+5 -1)
 		po/en_GB.po (1.40) (+406 -489)
+		po/en_TEST.po (1.40) (+438 -493)
 
 	More release note updates.
 
@@ -16581,6 +21938,7 @@
 
 	Files:	src/cups/Makefile.am (1.30) (+19 -4)
 		src/cups/genppd.c (1.24) (+99 -52)
+		src/ghost/README (1.24) (+295 -316)
 		src/main/print-util.c (1.41) (+2 -2)
 
 	genppd can now generate multiple languages - just need to update to
@@ -16593,6 +21951,11 @@
 2001-08-13	<rlk@sourceforge.net>
 
 	Files:	acconfig.h (1.15) (+4 -4)
+		configure.in.in (1.64) (+6 -6)
+		lib/libprintut.h (1.5) (+4 -4)
+		lib/vasprintf.c (1.3) (+1 -1)
+		lib/xmalloc.c (1.4) (+3 -3)
+		lib/xmalloc.h (1.5) (+4 -4)
 		man/escputil.1.in (1.4) (+6 -6)
 		po/POTFILES.in (1.7) (+0 -1)
 		src/cups/cups-calibrate.c (1.2) (+2 -2)
@@ -16600,6 +21963,7 @@
 		src/cups/rastertoprinter.c (1.18) (+3 -3)
 		src/escputil/escputil.c (1.24) (+2 -2)
 		src/foomatic/foomatic-generator.in (1.11) (+32 -32)
+		src/include/gimp-print.h.in (1.18) (+6 -6)
 		src/main/print-canon.c (1.64) (+55 -55)
 		src/main/print-escp2.c (1.103) (+184 -121)
 		src/main/print-lexmark.c (1.45) (+36 -36)
@@ -16616,8 +21980,12 @@
 	Files:	src/cups/genppd.c (1.22) (+63 -217)
 		src/cups/rastertoprinter.c (1.17) (+8 -4)
 		src/foomatic/printer_options.c (1.6) (+5 -4)
+		src/gimp/gimp_color_window.c (1.14) (+19 -5)
+		src/gimp/gimp_main_window.c (1.36) (+119 -67)
 		src/gimp/print_gimp.h (1.16) (+8 -8)
+		src/include/gimp-print.h.in (1.17) (+12 -5)
 		src/main/print-canon.c (1.63) (+165 -179)
+		src/main/print-dither.c (1.41) (+16 -7)
 		src/main/print-escp2.c (1.102) (+213 -207)
 		src/main/print-lexmark.c (1.44) (+199 -198)
 		src/main/print-pcl.c (1.39) (+132 -96)
@@ -16629,12 +21997,14 @@
 2001-08-13	<rlk@sourceforge.net>
 
 	Files:	test/Makefile.am (1.25) (+3 -5)
+		test/escp2-unprint.c (1.4) (removed)
 
 	escp2-unprint is obsolete.
 
 2001-08-13	<rlk@sourceforge.net>
 
-	Files:	src/testpattern/Makefile.am (1.2) (+2 -2)
+	Files:	src/main/gimp-print-internal.h (1.41) (+13 -4)
+		src/testpattern/Makefile.am (1.2) (+2 -2)
 
 	Nothing here needs libprintut (and libgimpprint should not require
 	linking against it!)
@@ -16653,16 +22023,24 @@
 
 2001-08-12	<rlk@sourceforge.net>
 
-	Files:	po/en_GB.po (1.39) (+98 -94)
+	Files:	configure.in.in (1.63) (+19 -2)
+		po/en_GB.po (1.39) (+98 -94)
+		po/en_TEST.po (1.39) (+99 -94)
 		src/Makefile.am (1.5) (+2 -2)
-		src/testpattern/.cvsignore (1.1) ( )
-		src/testpattern/Makefile.am (1.1) ( )
-		src/testpattern/testpattern.c (1.1) ( )
-		src/testpattern/testpattern.h (1.1) ( )
-		src/testpattern/testpattern.sample (1.1) ( )
-		src/testpattern/testpatternl.l (1.1) ( )
-		src/testpattern/testpatterny.y (1.1) ( )
+		src/printdef/Makefile.am (1.7) (+2 -1)
+		src/testpattern/.cvsignore (1.1) (added)
+		src/testpattern/Makefile.am (1.1) (added)
+		src/testpattern/testpattern.c (1.1) (added)
+		src/testpattern/testpattern.h (1.1) (added)
+		src/testpattern/testpattern.sample (1.1) (added)
+		src/testpattern/testpatternl.l (1.1) (added)
+		src/testpattern/testpatterny.y (1.1) (added)
 		test/Makefile.am (1.24) (+4 -14)
+		test/testpattern.c (1.9) (removed)
+		test/testpattern.h (1.2) (removed)
+		test/testpattern.sample (1.2) (removed)
+		test/testpatternl.l (1.2) (removed)
+		test/testpatterny.y (1.2) (removed)
 
 	Move testpattern generator to its own directory.
 
@@ -16692,8 +22070,10 @@
 
 2001-08-11	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.99) (+4 -7)
+	Files:	src/include/gimp-print.h.in (1.16) (+5 -3)
+		src/main/print-escp2.c (1.99) (+4 -7)
 		src/main/print-util.c (1.38) (+20 -1)
+		test/testpattern.c (1.8) (+5 -27)
 
 	stp_set_printer_defaults()
 
@@ -16711,12 +22091,24 @@
 
 2001-08-11	<rlk@sourceforge.net>
 
+	Files:	scripts/gimp-patch (1.3) (removed)
+
+	Remove obsolete Gimp patch.
+
+2001-08-11	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.97) (+31 -9)
 
 	Tune STC x80 printers.
 
 2001-08-11	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.23) (+4 -0)
+
+	Add 360 SW unidirectional.
+
+2001-08-11	<rlk@sourceforge.net>
+
 	Files:	src/escputil/escputil.c (1.22) (+24 -41)
 
 	Fix status command.
@@ -16732,8 +22124,10 @@
 2001-08-11	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.38) (+91 -91)
+		po/en_TEST.po (1.38) (+91 -91)
 		src/escputil/escputil.c (1.21) (+8 -8)
 		src/foomatic/foomatic-printermap (1.7) (+5 -2)
+		src/ghost/README (1.22) (+5 -2)
 		src/main/print-escp2.c (1.95) (+84 -7)
 		src/main/print-pcl.c (1.38) (+25 -1)
 		src/main/printers.xml (1.21) (+31 -3)
@@ -16752,6 +22146,11 @@
 
 	Files:	test/.cvsignore (1.4) (+4 -0)
 		test/Makefile.am (1.23) (+9 -3)
+		test/testpattern.c (1.7) (+73 -96)
+		test/testpattern.h (1.1) (added)
+		test/testpattern.sample (1.1) (added)
+		test/testpatternl.l (1.1) (added)
+		test/testpatterny.y (1.1) (added)
 
 	Read test patterns and such from an input file.
 
@@ -16765,6 +22164,12 @@
 
 2001-08-08	<rlk@sourceforge.net>
 
+	Files:	test/testpattern.c (1.6) (+98 -66)
+
+	Allow specification of gamma
+
+2001-08-08	<rlk@sourceforge.net>
+
 	Files:	test/unprint.c (1.13) (+94 -64)
 
 	Improve ink constants.
@@ -16776,7 +22181,11 @@
 2001-08-08	<rleigh@sourceforge.net>
 
 	Files:	acconfig.h (1.14) (+2 -33)
+		configure.in.in (1.62) (+18 -32)
+		debian/rules (1.21) (+1 -2)
+		lib/xmalloc.h (1.4) (+2 -2)
 		po/en_GB.po (1.37) (+55 -55)
+		po/en_TEST.po (1.37) (+55 -55)
 
 	configure.in.in: Fix small bugs in configure.in.in, and upgrade for 2.50 compatibility
 	acconfig.h: remove redundant entries
@@ -16787,6 +22196,20 @@
 
 	Provisional fix for STC 480/580.
 
+2001-08-08	<rlk@sourceforge.net>
+
+	Files:	test/testpattern.c (1.5) (+145 -109)
+
+	Allow scaling the image.
+
+	Allow starting a sweep at a point other than zero.
+
+2001-08-07	<rlk@sourceforge.net>
+
+	Files:	test/testpattern.c (1.4) (+25 -9)
+
+	GPL
+
 2001-08-07	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.93) (+29 -13)
@@ -16806,6 +22229,24 @@
 
 2001-08-07	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.40) (+14 -2)
+
+	Try to do light ink handling a bit more reasonably in CMYK mode.
+
+2001-08-07	<rlk@sourceforge.net>
+
+	Files:	test/testpattern.c (1.3) (+124 -380)
+
+	Convert everything to data-driven.
+
+2001-08-07	<rlk@sourceforge.net>
+
+	Files:	test/testpattern.c (1.2) (+122 -210)
+
+	Send all of the print functions through one "real" function.
+
+2001-08-07	<rlk@sourceforge.net>
+
 	Files:	test/unprint.c (1.12) (+62 -16)
 
 	If base resolution is <720DPI, all old Epson printers should be
@@ -16816,6 +22257,7 @@
 
 	Files:	src/main/print-color.c (1.22) (+8 -18)
 		test/Makefile.am (1.22) (+7 -3)
+		test/testpattern.c (1.1) (added)
 
 	Print a test pattern.
 
@@ -16824,7 +22266,8 @@
 
 2001-08-04	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.62) (+28 -105)
+	Files:	src/main/gimp-print-internal.h (1.40) (+3 -2)
+		src/main/print-canon.c (1.62) (+28 -105)
 		src/main/print-pcl.c (1.37) (+38 -74)
 		src/main/print-util.c (1.36) (+18 -1)
 
@@ -16833,7 +22276,8 @@
 
 2001-08-04	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.92) (+11 -9)
+	Files:	src/main/gimp-print-internal.h (1.39) (+10 -8)
+		src/main/print-escp2.c (1.92) (+11 -9)
 		src/main/print-lexmark.c (1.43) (+4 -4)
 		src/main/print-weave.c (1.33) (+4 -4)
 
@@ -16851,7 +22295,10 @@
 2001-08-03	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.106) (+26 -9)
+		configure.in.in (1.61) (+53 -30)
 		po/en_GB.po (1.36) (+1 -1)
+		po/en_TEST.po (1.36) (+1 -1)
+		scripts/patch-gimp (1.1) (added)
 		src/Makefile.am (1.4) (+5 -2)
 
 	Patch the gimp distribution a bit more intelligently.
@@ -16859,15 +22306,23 @@
 2001-08-03	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.35) (+1 -1)
+		po/en_TEST.po (1.35) (+1 -1)
 		src/cups/Makefile.am (1.29) (+3 -1)
 		src/foomatic/Makefile.am (1.11) (+7 -2)
 
 	Build PPD's and foomatic data during build rather than install.
 
+2001-08-03	<rlk@sourceforge.net>
+
+	Files:	scripts/gimp-patch (1.2) (+2 -2)
+
+	Omit the release date line, which changes and confuses patch.
+
 2001-08-02	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.39) (+33 -1)
 		README (1.66) (+1 -1)
+		debian/README.Debian (1.13) (+1 -1)
 
 	Bump version.
 
@@ -16887,6 +22342,7 @@
 2001-08-01	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.34) (+95 -95)
+		po/en_TEST.po (1.34) (+95 -95)
 		src/main/print-escp2.c (1.90) (+16 -3)
 		src/main/printers.xml (1.19) (+2 -2)
 		test/unprint.c (1.11) (+2 -2)
@@ -16895,6 +22351,13 @@
 
 	Clean up comment.
 
+2001-07-31	<rleigh@sourceforge.net>
+
+	Files:	debian/README.building (1.1) (added)
+		debian/README.building.from.CVS (1.8) (removed)
+
+	Update building README
+
 2001-07-31	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.89) (+128 -159)
@@ -16914,9 +22377,16 @@
 2001-07-29	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.105) (+5 -2)
+		scripts/gimp-patch (1.1) (added)
 
 	Add working gimp-dist support
 
+2001-07-29	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.21) (+1 -1)
+
+	Update version to 4.1.99-a3-1
+
 2001-07-29	<easysw@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.35) (+55 -6)
@@ -16946,8 +22416,11 @@
 
 2001-07-28	<rlk@sourceforge.net>
 
-	Files:	src/cups/rastertoprinter.c (1.16) (+12 -44)
+	Files:	configure.in.in (1.60) (+4 -4)
+		src/cups/rastertoprinter.c (1.16) (+12 -44)
+		src/ghost/gdevstp.c (1.10) (+5 -3)
 		src/gimp/print-image-gimp.c (1.5) (+6 -4)
+		src/include/gimp-print.h.in (1.15) (+11 -4)
 		src/main/print-canon.c (1.61) (+3 -2)
 		src/main/print-escp2.c (1.88) (+3 -2)
 		src/main/print-lexmark.c (1.42) (+3 -2)
@@ -16971,7 +22444,11 @@
 
 2001-07-26	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.33) (+91 -91)
+	Files:	configure.in.in (1.59) (+4 -4)
+		debian/changelog (1.20) (+3 -2)
+		debian/rules (1.20) (+5 -1)
+		po/en_GB.po (1.33) (+91 -91)
+		po/en_TEST.po (1.33) (+91 -91)
 
 	Put samples/profile.jpg into cupsys-driver-gimpprint debian package
 
@@ -17027,13 +22504,26 @@
 
 2001-07-22	<rlk@sourceforge.net>
 
-	Files:	samples/.cvsignore (1.1) ( )
+	Files:	samples/.cvsignore (1.1) (added)
 
 	.cvsignore
 
+2001-07-22	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.21) (+35 -19)
+
+	More minor updates.
+
+2001-07-22	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.20) (+6 -9)
+
+	No longer supports 180x120.
+
 2001-07-21	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.32) (+1 -1)
+		po/en_TEST.po (1.32) (+1 -1)
 
 	Update
 
@@ -17065,12 +22555,15 @@
 
 	Files:	Makefile.am (1.104) (+2 -2)
 		NEWS (1.36) (+27 -11)
+		configure.in.in (1.58) (+19 -2)
 		po/en_GB.po (1.31) (+90 -98)
-		samples/Makefile.am (1.1) ( )
-		samples/colorbars4.png (1.1) ( )
-		samples/colorsweep.png (1.1) ( )
-		samples/profile.jpg (1.1) ( )
+		po/en_TEST.po (1.31) (+98 -100)
+		samples/Makefile.am (1.1) (added)
+		samples/colorbars4.png (1.1) (added)
+		samples/colorsweep.png (1.1) (added)
+		samples/profile.jpg (1.1) (added)
 		src/cups/Makefile.am (1.28) (+2 -2)
+		src/cups/profile.jpg (1.2) (removed)
 
 	Create new samples directory containing various sample images.
 
@@ -17091,6 +22584,7 @@
 2001-07-20	<easysw@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.27) (+2 -2)
+		src/cups/profile.jpg (1.1) (added)
 		src/main/print-color.c (1.21) (+107 -69)
 
 	First run of color conversion optimizations, to improve performance
@@ -17103,6 +22597,8 @@
 	Files:	NEWS (1.35) (+5 -4)
 		README (1.64) (+9 -2)
 		po/en_GB.po (1.30) (+2 -2)
+		po/en_TEST.po (1.30) (+2 -2)
+		src/ghost/README (1.19) (+368 -196)
 
 	Update some README's.
 
@@ -17118,9 +22614,16 @@
 
 	Scale CMYK by density, too.
 
+2001-07-18	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.19) (+1 -1)
+
+	Change upstream version to correct format
+
 2001-07-18	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.29) (+242 -242)
+		po/en_TEST.po (1.29) (+245 -243)
 
 	updates
 
@@ -17133,10 +22636,14 @@
 2001-07-18	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.33) (+7 -0)
+		configure.in.in (1.57) (+4 -1)
+		lib/libprintut.h (1.4) (+5 -2)
+		lib/vasprintf.c (1.2) (+3 -3)
 		src/cups/genppd.c (1.20) (+3 -3)
 		src/escputil/escputil.c (1.17) (+14 -3)
 		src/foomatic/foomatic-printermap (1.5) (+2 -0)
 		src/main/print-canon.c (1.60) (+9 -3)
+		src/main/print-dither.c (1.39) (+12 -25)
 		src/main/print-escp2.c (1.80) (+3 -1)
 		src/main/print-util.c (1.35) (+5 -1)
 		src/main/printers.xml (1.17) (+41 -1)
@@ -17185,6 +22692,7 @@
 2001-07-17	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.18) (+62 -21)
+		src/include/gimp-print.h.in (1.14) (+2 -17)
 		src/main/print-pcl.c (1.32) (+13 -2)
 		src/main/print-util.c (1.33) (+9 -138)
 
@@ -17227,16 +22735,39 @@
 
 2001-07-15	<rlk@sourceforge.net>
 
+	Files:	src/foomatic/foomatic-templates/Color.xml (1.2) (+1 -1)
+
+	Fix color/outputtype
+
+2001-07-15	<rlk@sourceforge.net>
+
 	Files:	src/foomatic/foomatic-generator.in (1.9) (+7 -7)
 
 	Finish fixing color/outputtype
 
+2001-07-15	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.35) (+30 -45)
+
+	Tighten things up in the GUI some...
+
+2001-07-15	<rleigh@sourceforge.net>
+
+	Files:	doc/Makefile.am (1.11) (+0 -0)
+		src/main/Makefile.am (1.23) (+2 -2)
+
+	Fix debian packaging (remove README.dither from libgimpprint-dev.docs)
+	Fix HTML manual generation (only regenerate if out of date, or if building
+	in a separate tree
+	Add PostScript documentation option ('make ps')
+	Increment Debian changelog
+
 2001-07-15	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.103) (+4 -1)
+		configure.in.in (1.56) (+10 -6)
+		debian/changelog (1.18) (+2 -1)
 		doc/Makefile.am (1.10) (+40 -15)
-		doc/Makefile.am (1.11) (+0 -0)
-		src/main/Makefile.am (1.23) (+2 -2)
 
 	Fix debian packaging (remove README.dither from libgimpprint-dev.docs)
 	Fix HTML manual generation (only regenerate if out of date, or if building
@@ -17247,18 +22778,41 @@
 2001-07-15	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.8) (+1 -1)
+		src/foomatic/foomatic-templates/Color.xml (1.1) (added)
+		src/foomatic/foomatic-templates/OutputType.xml (1.2) (removed)
 		src/foomatic/printer_options.c (1.5) (+8 -8)
 
 	OutputType should have been named Color.
 
+2001-07-15	<sharkey@sourceforge.net>
+
+	Files:	doc/appendices.texi (1.4) (+3 -0)
+
+	Add chapter and intex tags.  (Merge from debian branch.)
+
+2001-07-15	<sharkey@sourceforge.net>
+
+	Files:	debian/control.in (1.6) (+2 -2)
+		debian/libgimpprint-dev.docs (1.4) (+0 -1)
+		debian/rules (1.19) (+4 -5)
+
+	Sync mainline branch with changes made on debian branch.
+
 2001-07-15	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.28) (+408 -391)
+		po/en_TEST.po (1.28) (+419 -395)
 
 	Updates
 
 2001-07-15	<rlk@sourceforge.net>
 
+	Files:	src/include/gimp-print.h.in (1.13) (+2 -98)
+
+	Clean up unused code for 4.2.
+
+2001-07-15	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.32) (+10 -6)
 
 	Update the foomatic data.
@@ -17268,7 +22822,20 @@
 	Files:	src/foomatic/Makefile.am (1.10) (+8 -4)
 		src/foomatic/foomatic-generator.in (1.7) (+41 -8)
 		src/foomatic/foomatic-printermap (1.4) (+4 -0)
+		src/foomatic/foomatic-templates/Brightness.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Contrast.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Cyan.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Density.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Dither.xml (1.2) (+6 -100)
+		src/foomatic/foomatic-templates/Gamma.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Greyscale.xml (1.2) (removed)
+		src/foomatic/foomatic-templates/ImageType.xml (1.2) (+8 -21)
+		src/foomatic/foomatic-templates/Magenta.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/OutputType.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Saturation.xml (1.2) (+3 -3)
+		src/foomatic/foomatic-templates/Yellow.xml (1.2) (+3 -3)
 		src/foomatic/printer_options.c (1.4) (+17 -6)
+		src/foomatic/stp_limits.c (1.1) (added)
 
 	Fix up options for the current state of the world.
 
@@ -17280,7 +22847,15 @@
 
 2001-07-14	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gimp_main_window.c (1.34) (+68 -38)
+
+	Shift-drag in the GIMP plugin constrains the image to vertical or
+	horizontal motion only.
+
+2001-07-14	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.30) (+23 -6)
+		src/ghost/README (1.18) (+4 -0)
 		src/main/print-escp2.c (1.78) (+129 -20)
 		src/main/printers.xml (1.16) (+35 -1)
 
@@ -17291,11 +22866,20 @@
 
 2001-07-14	<rlk@sourceforge.net>
 
-	Files:	src/main/print-weave.c (1.32) (+9 -5)
+	Files:	src/main/gimp-print-internal.h (1.38) (+4 -2)
+		src/main/print-weave.c (1.32) (+9 -5)
 
 	Allocate enough (extra) buffer space required for Stylus Photo 480/580
 	type printers.
 
+2001-07-14	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.33) (+135 -70)
+
+	Add vertical center and horizontal center buttons.
+
+	Reorganize some GUI elements.
+
 2001-07-13	<rlk@sourceforge.net>
 
 	Files:	src/main/print-util.c (1.31) (+8 -8)
@@ -17326,21 +22910,23 @@
 	made the source code being read), and second, the way how the lines were
 	evaluated didn't support option names with spaces.
 
-2001-07-10	<sharkey@sourceforge.net>
-
-	Files:	acconfig.h (1.8.2.4) (+2 -5)
-
-	Merging 4.1.99-a1 into the debian branch.
-
 2001-07-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.29) (+27 -2)
 		README (1.63) (+4 -4)
+		configure.in.in (1.55) (+3 -3)
+		debian/README.Debian (1.12) (+1 -1)
 
 	Bump version.
 
 2001-07-10	<rlk@sourceforge.net>
 
+	Files:	doc/functions.texi (1.4) (+120 -52)
+
+	Add some documentation.
+
+2001-07-10	<rlk@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.30) (+3 -2)
 
 	Allow use of black and white printing on black and white printers
@@ -17353,6 +22939,12 @@
 	Should use stp_allocate_vars() rather than
 	stp_allocate_copy(stp_default_vars()).
 
+2001-07-10	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.32) (+35 -23)
+
+	Move mouse properly in PPI mode.
+
 2001-07-07	<rlk@sourceforge.net>
 
 	Files:	src/main/print-weave.c (1.31) (+2 -2)
@@ -17370,8 +22962,16 @@
 2001-07-06	<rlk@sourceforge.net>
 
 	Files:	README (1.61) (+9 -17)
+		configure.in.in (1.54) (+12 -1)
 		src/ghost/Makefile.am (1.13) (+3 -2)
+		src/ghost/README (1.17) (+97 -57)
+		src/ghost/contrib.mak.addon (1.6) (removed)
+		src/ghost/contrib.mak.addon.in (1.1) (added)
+		src/ghost/contrib.mak.addon.old (1.1) (added)
+		src/ghost/gdevstp.c (1.9) (+5 -1)
+		src/main/gimp-print-internal.h (1.37) (+2 -4)
 		src/main/print-canon.c (1.58) (+8 -8)
+		src/main/print-dither.c (1.38) (+2 -1)
 		src/main/print-lexmark.c (1.40) (+11 -9)
 		src/main/print-pcl.c (1.31) (+14 -13)
 		src/main/print-util.c (1.29) (+11 -11)
@@ -17396,7 +22996,10 @@
 
 	Files:	NEWS (1.28) (+43 -1)
 		README (1.60) (+7 -7)
+		configure.in.in (1.53) (+5 -4)
+		debian/README.Debian (1.11) (+7 -6)
 		po/en_GB.po (1.27) (+190 -189)
+		po/en_TEST.po (1.27) (+191 -190)
 
 	4.1.99-a1 (4.2 alpha 1) release.
 
@@ -17424,9 +23027,26 @@
 
 	types.texi no longer exists; clean up a typo
 
+2001-07-05	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.37) (+38 -12)
+
+	Performance tweaks.
+
 2001-07-05	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.6) (+1 -1)
+		doc/appendices.texi (1.3) (+1 -1)
+		doc/escp2.texi (1.3) (+3 -3)
+		doc/functions.texi (1.3) (+215 -350)
+		doc/gimpprint.texi (1.5) (+2 -3)
+		doc/indices.texi (1.3) (+2 -2)
+		doc/integrating.texi (1.1) (added)
+		doc/introduction.texi (1.3) (+2 -2)
+		doc/new-printer.texi (1.2) (+3 -3)
+		doc/types.texi (1.2) (removed)
+		doc/using.texi (1.3) (+0 -193)
+		doc/weave.texi (1.3) (+3 -3)
 
 	Split using.texi into integrating.texi
 	Move type descriptions into functions.texi
@@ -17468,7 +23088,16 @@
 
 2001-07-02	<rleigh@sourceforge.net>
 
+	Files:	doc/README.dither (1.2) (removed)
+		doc/dither.texi (1.2) (+501 -0)
+		doc/introduction.texi (1.2) (+17 -19)
+
+	Move README.dither into Texinfo manual
+
+2001-07-02	<rleigh@sourceforge.net>
+
 	Files:	acconfig.h (1.13) (+2 -5)
+		configure.in.in (1.52) (+2 -2)
 
 	Remove redundant #defines
 	Remove -ansi from GNUCFLAGS
@@ -17506,6 +23135,18 @@
 
 	Fixed missing DMT modes of some of the models.
 
+2001-07-02	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.36) (+52 -42)
+
+	Improve print quality with fast and very fast dither in 6-color mode.
+
+2001-07-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.31) (+2 -2)
+
+	Silly typo that crept in earlier.
+
 2001-07-01	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.14) (+40 -22)
@@ -17514,7 +23155,9 @@
 
 2001-07-01	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.19) (+5 -13)
+	Files:	src/gimp/gimp_color_window.c (1.13) (+48 -57)
+		src/gimp/gimp_main_window.c (1.30) (+222 -329)
+		src/gimp/print.c (1.19) (+5 -13)
 		src/gimp/print_gimp.h (1.15) (+5 -2)
 
 	Clean up the duplication between vars and the printer list.  This may
@@ -17523,27 +23166,47 @@
 
 2001-07-01	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.14) (+4 -1)
+	Files:	src/gimp/gimp_main_window.c (1.29) (+177 -172)
+
+	Split up preview update.
+
+2001-07-01	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.12) (+28 -8)
+		src/gimp/gimp_main_window.c (1.28) (+490 -551)
+		src/gimp/print_gimp.h (1.14) (+4 -1)
 
 	Clean up UI initialization.
 
+2001-07-01	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.27) (+29 -17)
+
+	Use the drawing window more generously.
+
+2001-07-01	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.26) (+3 -1)
+
+	Preserve the custom page size when switching printers.
+
 2001-06-30	<rlk@sourceforge.net>
 
 	Files:	src/main/print-version.c (1.4) (+1 -3)
 
 	No need for unistd.h here.
 
-2001-06-30	<sharkey@sourceforge.net>
+2001-06-24	<rleigh@sourceforge.net>
 
-	Files:	acconfig.h (1.8.2.3) (+1 -10)
+	Files:	src/cups/Makefile.am (1.26) (+2 -8)
 
-	Merge in 4.1.10 for the 4.1.10-1 debian release.
+	Change from `foreign' to `gnu' as cups/ no longer has a separate configure.in
 
 2001-06-24	<rleigh@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.26) (+2 -8)
+	Files:	doc/using.texi (1.2) (+1 -1)
 
-	Change from `foreign' to `gnu' as cups/ no longer has a separate configure.in
+	Fix typo in AM_PATH_GIMPPRINT definition
 
 2001-06-19	<ttonino@sourceforge.net>
 
@@ -17559,19 +23222,11 @@
 
 	Edited typo or search and replace bogosity.
 
-2001-06-19	<easysw@sourceforge.net>
-
-	Files:	escputil.c (1.15.2.3) (+3 -1)
-		print-escp2.c (1.265.2.4) (+2 -2)
-
-	Fix init commands for 680/777 (wasn't sending packet mode init command
-	for USB interface...)
-
-	Add 680 and 777 to model list in escputil.
-
 2001-06-17	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.102) (+2 -2)
+		debian/README.building.from.CVS (1.7) (+15 -1)
+		debian/libgimpprint-dev.docs (1.3) (+0 -3)
 
 	Fix debian/control.in parsing in Makefile.am dist-hook rule
 	Remove files from debian/libgimpprint-dev.docs that no longer exist
@@ -17580,14 +23235,44 @@
 2001-06-16	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.5) (+1 -2)
+		doc/README.new-printer (1.3) (removed)
+		doc/appendices.texi (1.2) (+5 -4)
+		doc/escp2.texi (1.2) (+14 -8)
+		doc/functions.texi (1.2) (+2 -1)
+		doc/indices.texi (1.2) (+1 -1)
+		doc/new-printer.texi (1.1) (added)
+		doc/weave.texi (1.2) (+69 -38)
 
 	Move README.new-printer into Texinfo manual as an appendix
 
 2001-06-16	<rleigh@sourceforge.net>
 
+	Files:	doc/texinfo.tex (1.1) (added)
+
+	Add latest texinfo.tex, to avoid problems with older versions
+
+2001-06-16	<rleigh@sourceforge.net>
+
 	Files:	doc/.cvsignore (1.3) (+0 -1)
 		doc/Makefile.am (1.4) (+15 -5)
+		doc/README.escp2 (1.6) (removed)
+		doc/README.weave (1.4) (removed)
+		doc/appendices.texi (1.1) (added)
+		doc/copying.texi (1.1) (added)
+		doc/dither.texi (1.1) (added)
+		doc/escp2.texi (1.1) (added)
+		doc/functions.texi (1.1) (added)
+		doc/gimpprint.texi (1.4) (+21 -1295)
+		doc/indices.texi (1.1) (added)
+		doc/introduction.texi (1.1) (added)
+		doc/overview.texi (1.1) (added)
+		doc/problems.texi (1.1) (added)
+		doc/programs.texi (1.1) (added)
+		doc/types.texi (1.1) (added)
+		doc/using.texi (1.1) (added)
+		doc/weave.texi (1.1) (added)
 		po/en_GB.po (1.26) (+211 -211)
+		po/en_TEST.po (1.26) (+211 -211)
 
 	Move README.escp2 and README.weave into the Texinfo manual
 	Split Texinfo manual into separate files for ease of maintaining
@@ -17612,11 +23297,24 @@
 
 2001-06-14	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.76) (+2 -3)
+	Files:	src/main/gimp-print-internal.h (1.36) (+4 -2)
+		src/main/print-escp2.c (1.76) (+2 -3)
 		src/main/print-weave.c (1.28) (+110 -72)
 
 	Further reduce memory consumption, particularly at high resolution.
 
+2001-06-14	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.25) (+3 -3)
+
+	Move the preview correctly when using button 2.
+
+2001-06-13	<rlk@sourceforge.net>
+
+	Files:	doc/README.weave (1.3) (+14 -12)
+
+	Minor cleanup.
+
 2001-06-13	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.47) (+16 -13)
@@ -17630,11 +23328,31 @@
 
 2001-06-12	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.13) (+2 -8)
+	Files:	doc/README.escp2 (1.5) (+12 -11)
+
+	Don't choke when this is pasted into HTML.
+
+2001-06-12	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.11) (+2 -1)
+		src/gimp/gimp_main_window.c (1.24) (+35 -7)
+		src/gimp/print_gimp.h (1.13) (+2 -8)
 
 	Use the correct printer defaults rather than simply the first
 	option in the set.
 
+2001-06-11	<rlk@sourceforge.net>
+
+	Files:	doc/README.weave (1.2) (+145 -134)
+
+	Minor updates
+
+2001-06-11	<rlk@sourceforge.net>
+
+	Files:	doc/README.escp2 (1.4) (+83 -68)
+
+	Cleanup.
+
 2001-06-10	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.75) (+2 -3)
@@ -17667,11 +23385,20 @@
 
 	Handle new command set.
 
+2001-06-10	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.17) (+2 -2)
+
+	Update debian package version
+
 2001-06-09	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.27) (+5 -2)
 		README (1.59) (+1 -1)
+		configure.in.in (1.51) (+3 -3)
+		debian/README.Debian (1.10) (+1 -1)
 		po/en_GB.po (1.25) (+1 -1)
+		po/en_TEST.po (1.25) (+1 -1)
 		src/main/print-weave.c (1.27) (+16 -7)
 
 	Gimp-Print 4.1.10 release
@@ -17686,6 +23413,9 @@
 
 	Files:	NEWS (1.26) (+17 -1)
 		README (1.58) (+1 -1)
+		configure.in.in (1.50) (+3 -3)
+		debian/README.Debian (1.9) (+1 -1)
+		src/main/gimp-print-internal.h (1.35) (+7 -5)
 		src/main/print-weave.c (1.25) (+23 -15)
 
 	Fix crash/possible data corruption in weave code.  Under certain
@@ -17697,6 +23427,7 @@
 2001-06-08	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.24) (+4 -4)
+		po/en_TEST.po (1.24) (+4 -4)
 
 	.
 
@@ -17733,6 +23464,7 @@
 2001-06-08	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.23) (+87 -87)
+		po/en_TEST.po (1.23) (+87 -87)
 
 	.
 
@@ -17744,7 +23476,9 @@
 
 2001-06-07	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.72) (+61 -34)
+	Files:	src/gimp/gimp_main_window.c (1.23) (+81 -26)
+		src/main/print-escp2.c (1.72) (+61 -34)
+		src/printdef/printdefy.y (1.6) (+3 -3)
 
 	Eliminate flashing in the UI when moving the preview image against
 	the borders of the page; also reduce (and hopefully eliminate) any
@@ -17764,6 +23498,7 @@
 2001-06-04	<rleigh@sourceforge.net>
 
 	Files:	.cvsignore (1.14) (+1 -0)
+		debian/.cvsignore (1.5) (+1 -0)
 		doc/.cvsignore (1.2) (+3 -0)
 		src/main/.cvsignore (1.4) (+1 -0)
 
@@ -17773,38 +23508,49 @@
 
 	Files:	Makefile.am (1.101) (+2 -2)
 		acconfig.h (1.12) (+1 -4)
+		configure.in.in (1.49) (+1 -5)
 		po/en_GB.po (1.22) (+172 -172)
+		po/en_TEST.po (1.22) (+172 -172)
 
 	Remove GIMP_PRINT_MAINT from configure.in.in
 	Fix sed parsing of debian/changelog in Makefile.am
 
 2001-06-04	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.21) (+1 -1)
+	Files:	configure.in.in (1.48) (+1 -14)
+		po/en_GB.po (1.21) (+1 -1)
+		po/en_TEST.po (1.21) (+1 -1)
 		src/cups/Makefile.am (1.25) (+2 -2)
+		src/printdef/printdefy.y (1.5) (+4 -1)
 
 	Remove CUPS_CFLAGS
 	Add prototypes to printdefy.y
 
 2001-06-03	<rlk@sourceforge.net>
 
-	Files:	src/cups/canon.c (1.2) (+1 -1)
+	Files:	configure.in.in (1.47) (+2 -2)
+		src/cups/canon.c (1.2) (+1 -1)
 		src/cups/commandtoepson.c (1.2) (+3 -3)
 		src/cups/epson.c (1.2) (+3 -3)
 		src/cups/genppd.c (1.16) (+3 -3)
 		src/escputil/escputil.c (1.13) (+41 -45)
 		src/foomatic/paper_sizes.c (1.3) (+1 -12)
 		src/foomatic/printer_options.c (1.3) (+2 -2)
+		src/gimp/gimp_color_window.c (1.10) (+12 -2)
+		src/gimp/gimp_main_window.c (1.22) (+4 -4)
 		src/gimp/print.c (1.17) (+6 -5)
 		src/gimp/print_gimp.h (1.12) (+5 -1)
 		src/main/print-canon.c (1.46) (+22 -22)
 		src/main/print-color.c (1.18) (+5 -1)
+		src/main/print-dither.c (1.35) (+12 -9)
 		src/main/print-escp2.c (1.71) (+94 -94)
 		src/main/print-lexmark.c (1.39) (+29 -24)
 		src/main/print-pcl.c (1.30) (+3 -3)
 		src/main/print-ps.c (1.17) (+3 -3)
 		src/main/print-util.c (1.28) (+39 -39)
 		src/main/print-weave.c (1.24) (+3 -3)
+		src/printdef/printdefl.l (1.2) (+16 -3)
+		src/printdef/printdefy.y (1.4) (+4 -4)
 		test/bjc-unprint.c (1.5) (+4 -4)
 		test/pcl-unprint.c (1.5) (+35 -35)
 		test/testdither.c (1.10) (+4 -4)
@@ -17817,6 +23563,7 @@
 
 	Files:	Makefile.am (1.100) (+2 -2)
 		acconfig.h (1.11) (+3 -9)
+		configure.in.in (1.46) (+31 -64)
 		src/cups/Makefile.am (1.24) (+13 -4)
 		src/escputil/Makefile.am (1.9) (+2 -2)
 		src/escputil/escputil.c (1.12) (+14 -6)
@@ -17825,8 +23572,11 @@
 		src/gimp/print.c (1.16) (+6 -6)
 		src/gimp/print_gimp.h (1.11) (+3 -2)
 		src/main/Makefile.am (1.22) (+3 -3)
+		src/main/gimp-print-internal.h (1.34) (+6 -2)
+		src/printdef/Makefile.am (1.6) (+2 -2)
 		test/Makefile.am (1.19) (+3 -3)
 		test/bjc-unprint.c (1.4) (+19 -1)
+		test/escp2-unprint.c (1.3) (+12 -1)
 		test/escp2-weavetest.c (1.18) (+2 -2)
 		test/pcl-unprint.c (1.4) (+13 -2)
 		test/testdither.c (1.9) (+11 -11)
@@ -17838,11 +23588,18 @@
 2001-06-03	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.20) (+62 -62)
+		po/en_TEST.po (1.20) (+62 -62)
 
 	Updates
 
 2001-06-03	<rlk@sourceforge.net>
 
+	Files:	doc/print-main.png (1.2) (+65 -26)
+
+	Update the screen shot.
+
+2001-06-03	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.23) (+36 -5)
 
 	Latest updates
@@ -17853,22 +23610,42 @@
 
 	Minor typo
 
+2001-06-03	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.21) (+101 -9)
+
+	Abort an image move operation (with the mouse in the preview window)
+	if another mouse button is pressed.
+
+	The middle mouse button moves the image in increments of the image
+	size.
+
 2001-06-02	<rleigh@sourceforge.net>
 
 	Files:	po/en_GB.po (1.19) (+140 -140)
+		po/en_TEST.po (1.19) (+140 -140)
 		test/Makefile.am (1.18) (+2 -2)
 
 	Back out distributing test/mixed-color-1bit.ppm wrongly
 
+2001-06-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.9) (+1 -3)
+
+	Enable and disable only the things that need to be enabled/disabled.
+
 2001-06-02	<rleigh@sourceforge.net>
 
-	Files:	man/Makefile.am (1.6) (+9 -1)
+	Files:	configure.in.in (1.45) (+30 -29)
+		man/Makefile.am (1.6) (+9 -1)
 		src/cups/Makefile.am (1.23) (+25 -24)
 		src/escputil/Makefile.am (1.8) (+13 -1)
 		src/foomatic/Makefile.am (1.7) (+29 -9)
 		src/ghost/Makefile.am (1.11) (+10 -2)
 		src/gimp/Makefile.am (1.15) (+17 -5)
+		src/include/Makefile.am (1.8) (+7 -1)
 		src/main/Makefile.am (1.21) (+23 -2)
+		src/printdef/Makefile.am (1.5) (+10 -1)
 		test/Makefile.am (1.17) (+13 -3)
 
 	Remove conditional compilation definitions out of configure.in into
@@ -17878,12 +23655,14 @@
 
 	Files:	Makefile.am (1.99) (+2 -2)
 		po/en_GB.po (1.18) (+407 -258)
+		po/en_TEST.po (1.18) (+432 -258)
 
 	Make debian/changelog parsing safer
 
 2001-06-02	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.45) (+13 -1)
+	Files:	src/main/gimp-print-internal.h (1.33) (+3 -15)
+		src/main/print-canon.c (1.45) (+13 -1)
 		src/main/print-escp2.c (1.70) (+18 -7)
 		src/main/print-weave.c (1.23) (+7 -7)
 
@@ -17897,10 +23676,24 @@
 
 2001-06-02	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print_gimp.h (1.10) (+4 -2)
+	Files:	src/main/print-dither.c (1.34) (+253 -661)
+
+	More cleanup.
+
+2001-06-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_color_window.c (1.8) (+20 -1)
+		src/gimp/gimp_main_window.c (1.20) (+5 -1)
+		src/gimp/print_gimp.h (1.10) (+4 -2)
 
 	Disable color-specific sliders in monochrome modes.
 
+2001-06-01	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.44) (+2 -2)
+
+	Build test/testdither with the rest of test/
+
 2001-06-01	<rlk@sourceforge.net>
 
 	Files:	scripts/mkchlog (1.2) (+2 -0)
@@ -17918,16 +23711,24 @@
 
 	Files:	NEWS (1.22) (+18 -6)
 		README (1.57) (+5 -3)
+		configure.in.in (1.43) (+1 -2)
 		po/POTFILES.in (1.6) (+1 -0)
 		src/cups/genppd.c (1.15) (+83 -94)
 		src/escputil/escputil.c (1.11) (+7 -1)
 		src/foomatic/foomatic-generator.in (1.4) (+1 -1)
 		src/ghost/Makefile.am (1.9) (+2 -2)
+		src/ghost/README (1.16) (+146 -70)
+		src/ghost/contrib.mak.addon (1.5) (+4 -0)
+		src/ghost/devs.mak.addon-5.10 (1.5) (+4 -0)
+		src/gimp/gimp_color_window.c (1.7) (+28 -47)
+		src/gimp/gimp_main_window.c (1.19) (+14 -39)
 		src/gimp/print.c (1.15) (+2 -4)
 		src/gimp/print_gimp.h (1.9) (+44 -2)
 		src/main/Makefile.am (1.20) (+2 -1)
+		src/main/gimp-print-internal.h (1.32) (+47 -21)
 		src/main/print-canon.c (1.44) (+8 -2)
 		src/main/print-dither-matrices.c (1.2) (+61 -0)
+		src/main/print-dither.c (1.33) (+981 -2046)
 		src/main/print-escp2.c (1.69) (+393 -161)
 		src/main/print-lexmark.c (1.38) (+6 -3)
 		src/main/print-pcl.c (1.29) (+7 -1)
@@ -17974,8 +23775,10 @@
 
 2001-05-30	<rleigh@sourceforge.net>
 
-	Files:	src/foomatic/Makefile.am (1.6) (+4 -4)
+	Files:	configure.in.in (1.42) (+18 -9)
+		src/foomatic/Makefile.am (1.6) (+4 -4)
 		src/main/Makefile.am (1.19) (+2 -2)
+		src/main/gimpprint-config.in (1.4) (+1 -1)
 		test/Makefile.am (1.16) (+2 -2)
 
 	Fix library linking problems by use of GIMPPRINT_DEPLIBS
@@ -17983,7 +23786,7 @@
 
 2001-05-29	<rlk@sourceforge.net>
 
-	Files:	src/main/print-dither-matrices.c (1.1) ( )
+	Files:	src/main/print-dither-matrices.c (1.1) (added)
 
 	file print-dither-matrices.c was initially added on branch stylus-pro-branch.
 
@@ -17991,7 +23794,9 @@
 
 	Files:	Makefile.am (1.98) (+5 -1)
 		README (1.56) (+1 -1)
+		debian/changelog (1.16) (+6 -0)
 		po/en_GB.po (1.17) (+397 -378)
+		po/en_TEST.po (1.17) (+407 -383)
 
 	Automatically generate debian/changelog during 'make dist'
 
@@ -18005,12 +23810,18 @@
 
 	Files:	NEWS (1.21) (+29 -5)
 		README (1.55) (+13 -8)
+		configure.in.in (1.41) (+4 -4)
 		src/cups/genppd.c (1.14) (+2 -3)
+		src/ghost/README (1.15) (+25 -18)
+		src/ghost/gdevstp.c (1.8) (+7 -1)
+		src/gimp/gimp_main_window.c (1.18) (+41 -36)
 		src/gimp/print-image-gimp.c (1.4) (+5 -5)
 		src/gimp/print.c (1.14) (+66 -66)
 		src/gimp/print_gimp.h (1.8) (+2 -4)
+		src/include/gimp-print.h.in (1.12) (+5 -6)
 		src/main/print-canon.c (1.42) (+19 -16)
 		src/main/print-color.c (1.17) (+21 -25)
+		src/main/print-dither.c (1.32) (+6 -18)
 		src/main/print-escp2.c (1.68) (+7 -6)
 		src/main/print-lexmark.c (1.37) (+57 -59)
 		src/main/print-pcl.c (1.28) (+16 -17)
@@ -18023,9 +23834,16 @@
 	Move the monochrome option from image type to output type, as part
 	of an overall start on rationalizing the options.
 
+2001-05-20	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.17) (+68 -50)
+
+	Convert printer list to combo.
+
 2001-05-19	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.13) (+66 -131)
+	Files:	src/gimp/gimp_main_window.c (1.16) (+152 -43)
+		src/gimp/print.c (1.13) (+66 -131)
 		src/gimp/print_gimp.h (1.7) (+4 -1)
 
 	Capability to add a new printer
@@ -18079,6 +23897,7 @@
 
 	Files:	src/main/print-canon.c (1.40) (+47 -47)
 		src/main/print-color.c (1.15) (+18 -7)
+		src/main/print-dither.c (1.31) (+2 -12)
 		src/main/print-escp2.c (1.63) (+34 -25)
 		src/main/print-lexmark.c (1.34) (+108 -54)
 		src/main/print-pcl.c (1.25) (+108 -54)
@@ -18104,9 +23923,14 @@
 2001-05-12	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.13) (+2 -3)
+		src/gimp/gimp_color_window.c (1.6) (+2 -1)
+		src/gimp/gimp_main_window.c (1.15) (+3 -4)
 		src/gimp/print.c (1.12) (+4 -2)
+		src/include/gimp-print.h.in (1.11) (+3 -6)
+		src/main/gimp-print-internal.h (1.31) (+10 -2)
 		src/main/print-canon.c (1.39) (+54 -52)
 		src/main/print-color.c (1.14) (+6 -6)
+		src/main/print-dither.c (1.30) (+14 -14)
 		src/main/print-escp2.c (1.61) (+5 -6)
 		src/main/print-lexmark.c (1.33) (+76 -77)
 		src/main/print-pcl.c (1.24) (+36 -35)
@@ -18125,7 +23949,9 @@
 	Files:	NEWS (1.20) (+8 -3)
 		src/gimp/print-image-gimp.c (1.3) (+17 -14)
 		src/gimp/print.c (1.11) (+3 -3)
+		src/main/gimp-print-internal.h (1.30) (+8 -2)
 		src/main/print-color.c (1.13) (+15 -28)
+		src/main/print-dither.c (1.29) (+52 -49)
 		src/main/print-util.c (1.23) (+42 -9)
 
 	Create a debugging framework rather than #ifdef's everywhere.
@@ -18146,6 +23972,8 @@
 
 	Files:	NEWS (1.19) (+11 -1)
 		README (1.54) (+1 -1)
+		configure.in.in (1.40) (+3 -3)
+		debian/README.Debian (1.8) (+1 -1)
 
 	Bump version.
 
@@ -18159,8 +23987,13 @@
 
 2001-05-11	<rleigh@sourceforge.net>
 
-	Files:	doc/Makefile.am (1.3) (+4 -3)
+	Files:	configure.in.in (1.39) (+2 -2)
+		debian/changelog (1.15) (+3 -2)
+		debian/control.in (1.5) (+1 -0)
+		debian/rules (1.18) (+2 -1)
+		doc/Makefile.am (1.3) (+4 -3)
 		po/en_GB.po (1.16) (+1 -1)
+		po/en_TEST.po (1.16) (+1 -1)
 
 	configure.in.in: fix incorrect texi2html error message
 	Debian: add new HTML manual to doc-base for libgimpprint-doc
@@ -18169,13 +24002,22 @@
 2001-05-09	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.97) (+7 -4)
+		configure.in.in (1.38) (+5 -2)
 		doc/Makefile.am (1.2) (+32 -2)
+		doc/gimpprint.texi (1.3) (+2 -2)
 		po/en_GB.po (1.15) (+1 -1)
+		po/en_TEST.po (1.15) (+1 -1)
 		src/cups/Makefile.am (1.22) (+3 -3)
 
 	Add html generation from Texinfo source
 	Unify dist-hook in all directories
 
+2001-05-09	<sharkey@sourceforge.net>
+
+	Files:	debian/control.in (1.4) (+1 -1)
+
+	Add flex to build depends on the mainline too.
+
 2001-05-09	<rlk@sourceforge.net>
 
 	Files:	src/main/print-util.c (1.22) (+2 -2)
@@ -18190,17 +24032,30 @@
 
 2001-05-06	<rleigh@sourceforge.net>
 
-	Files:	man/.cvsignore (1.3) (+1 -0)
+	Files:	Ghost/.cvsignore (1.6) (removed)
+
+	Remove redundant file
+
+2001-05-06	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.37) (+7 -7)
+		debian/libgimpprint-dev.files (1.4) (+1 -0)
+		lib/.cvsignore (1.5) (+4 -1)
+		man/.cvsignore (1.3) (+1 -0)
 		man/Makefile.am (1.5) (+2 -2)
 		man/cups-calibrate.8.in (1.2) (+36 -3)
 		man/escputil.1.in (1.3) (+25 -0)
+		man/gimpprint-config.1.in (1.2) (+38 -9)
+		man/gimpprint.3.in (1.1) (added)
 		src/cups/Makefile.am (1.21) (+2 -2)
 		src/escputil/Makefile.am (1.7) (+3 -5)
 		src/foomatic/Makefile.am (1.5) (+2 -5)
 		src/ghost/.cvsignore (1.4) (+1 -0)
 		src/gimp/Makefile.am (1.13) (+3 -5)
+		src/include/.cvsignore (1.2) (+1 -0)
 		src/main/.cvsignore (1.3) (+1 -0)
 		src/main/Makefile.am (1.18) (+2 -4)
+		src/printdef/Makefile.am (1.4) (+2 -4)
 		test/Makefile.am (1.15) (+2 -4)
 
 	Update all .cvsignore files
@@ -18223,6 +24078,7 @@
 2001-05-05	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.96) (+4 -4)
+		configure.in.in (1.36) (+2 -2)
 		src/cups/Makefile.am (1.20) (+17 -7)
 		src/ghost/Makefile.am (1.8) (+6 -2)
 
@@ -18234,10 +24090,28 @@
 
 	Note fix to 404260
 
+2001-05-04	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.35) (+2 -2)
+		lib/Makefile.am (1.4) (+1 -4)
+
+	Fix gettext header inclusion
+
+2001-05-04	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.14) (+2 -0)
+
+	Fix broken entry
+
 2001-05-03	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.95) (+2 -2)
+		debian/changelog (1.13) (+6 -0)
+		debian/control.in (1.3) (+11 -0)
+		debian/rules (1.17) (+70 -49)
+		doc/gimpprint.texi (1.2) (+1 -2)
 		po/en_GB.po (1.14) (+186 -196)
+		po/en_TEST.po (1.14) (+196 -200)
 
 	Add Debian package libgimpprint-doc, and update debian/rules and
 	debian/control.
@@ -18247,9 +24121,14 @@
 2001-05-03	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.94) (+2 -2)
-		doc/.cvsignore (1.1) ( )
-		doc/Makefile.am (1.1) ( )
+		configure.in.in (1.34) (+8 -7)
+		doc/.cvsignore (1.1) (added)
+		doc/Makefile.am (1.1) (added)
+		doc/gimpprint.texi (1.1) (added)
+		doc/gpl.texi (1.1) (added)
 		src/foomatic/.cvsignore (1.2) (+2 -0)
+		src/include/gimp-print.h.in (1.10) (+202 -198)
+		src/main/gimpprint-config.in (1.3) (+1 -1)
 
 	Add Texinfo documentation (gimmprint.texi)
 	Correct typo in gimpprint-config.in
@@ -18261,6 +24140,8 @@
 
 	Files:	NEWS (1.17) (+52 -2)
 		README (1.52) (+1 -1)
+		configure.in.in (1.33) (+3 -3)
+		debian/README.Debian (1.7) (+1 -1)
 
 	Prep for 4.1.7.
 
@@ -18278,6 +24159,14 @@
 
 2001-05-03	<rlk@sourceforge.net>
 
+	Files:	src/main/print-dither.c (1.28) (+380 -123)
+
+	It turns out that alternating direction with each pass is indeed
+	important in error diffusion mode for printing very fine diagonal
+	lines.
+
+2001-05-03	<rlk@sourceforge.net>
+
 	Files:	src/cups/rastertoprinter.c (1.13) (+22 -2)
 
 	More comprehensive debugging information
@@ -18290,7 +24179,9 @@
 
 2001-05-02	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.54) (+3 -3)
+	Files:	src/ghost/README (1.14) (+19 -32)
+		src/main/print-dither.c (1.27) (+312 -433)
+		src/main/print-escp2.c (1.54) (+3 -3)
 
 	Improve black transition on variable dot size printers.
 
@@ -18328,15 +24219,19 @@
 	Changed PCL_STP_PRINTER_TIFF back to PCL_PRINTER_TIFF (over zealous
 	search and destroy!).
 
-2001-04-30	<sharkey@sourceforge.net>
+2001-04-29	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.26) (+15 -26)
 
-	Files:	acconfig.h (1.8.2.2) (+2 -1)
+	Fix problem with excessive ink in adaptive mode.
 
-	Finally get around to syncing debian-branch with 4.1.6.
+	Turn off debug code that was accidentally left on.
 
 2001-04-29	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.38) (+2 -24)
+	Files:	src/main/gimp-print-internal.h (1.29) (+3 -3)
+		src/main/print-canon.c (1.38) (+2 -24)
+		src/main/print-dither.c (1.25) (+37 -29)
 		src/main/print-escp2.c (1.53) (+1 -29)
 		src/main/print-lexmark.c (1.32) (+29 -39)
 		src/main/print-pcl.c (1.22) (+1 -2)
@@ -18354,17 +24249,28 @@
 
 	Add correct dependencies on libgimpprint.
 
+2001-04-28	<rlk@sourceforge.net>
+
+	Files:	src/ghost/gdevstp.c (1.7) (+2 -1)
+
+	Add call to stp_init()
+
 2001-04-27	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.93) (+3 -5)
+		configure.in.in (1.32) (+5 -2)
+		debian/rules (1.16) (+7 -4)
 		po/en_GB.po (1.13) (+366 -418)
+		po/en_TEST.po (1.13) (+389 -419)
 		src/cups/genppd.c (1.11) (+8 -2)
 		src/cups/rastertoprinter.c (1.12) (+9 -2)
 		src/escputil/Makefile.am (1.6) (+1 -2)
 		src/gimp/Makefile.am (1.12) (+1 -2)
 		src/gimp/print.c (1.9) (+8 -2)
+		src/include/gimp-print.h.in (1.9) (+8 -5)
 		src/main/Makefile.am (1.17) (+1 -2)
 		src/main/print-util.c (1.19) (+13 -2)
+		src/printdef/Makefile.am (1.3) (+1 -2)
 		test/Makefile.am (1.14) (+1 -2)
 		test/escp2-weavetest.c (1.17) (+7 -1)
 		test/testdither.c (1.7) (+7 -2)
@@ -18381,7 +24287,9 @@
 
 2001-04-22	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.51) (+84 -47)
+	Files:	src/ghost/README (1.13) (+16 -0)
+		src/main/print-dither.c (1.24) (+937 -450)
+		src/main/print-escp2.c (1.51) (+84 -47)
 
 	Enable composite gray (no black ink) printing on Epson printers as an
 	additional option.
@@ -18390,6 +24298,10 @@
 
 	Files:	src/cups/genppd.c (1.10) (+35 -16)
 		src/foomatic/printer_options.c (1.2) (+29 -4)
+		src/ghost/gdevstp.c (1.6) (+3 -2)
+		src/gimp/gimp_color_window.c (1.5) (+57 -56)
+		src/gimp/gimp_main_window.c (1.14) (+100 -116)
+		src/include/gimp-print.h.in (1.8) (+118 -5)
 		src/main/print-canon.c (1.37) (+103 -14)
 		src/main/print-escp2.c (1.50) (+64 -18)
 		src/main/print-lexmark.c (1.31) (+97 -14)
@@ -18416,9 +24328,16 @@
 
 2001-04-21	<rlk@sourceforge.net>
 
+	Files:	configure.in.in (1.31) (+2 -2)
+
+	Handle the Foomatic stuff more correctly.
+
+2001-04-21	<rlk@sourceforge.net>
+
 	Files:	src/foomatic/Makefile.am (1.4) (+11 -3)
 		src/foomatic/foomatic-generator.in (1.3) (+10 -10)
-		src/foomatic/paper_sizes.c (1.1) ( )
+		src/foomatic/gimp-print-version.c (1.1) (added)
+		src/foomatic/paper_sizes.c (1.1) (added)
 
 	Extract data correctly from the library rather than trying to parse
 	source files.
@@ -18438,6 +24357,12 @@
 
 	Get rid of a somewhat bogus warning.
 
+2001-04-19	<rlk@sourceforge.net>
+
+	Files:	lib/libprintut.h (1.3) (+3 -3)
+
+	Fix declarations (that very few people use)
+
 2001-04-15	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.49) (+2 -2)
@@ -18452,6 +24377,12 @@
 
 2001-04-15	<rlk@sourceforge.net>
 
+	Files:	doc/README.escp2 (1.3) (+16 -2)
+
+	Document a few more remote mode commands
+
+2001-04-15	<rlk@sourceforge.net>
+
 	Files:	src/main/print-ps.c (1.11) (+5 -1)
 
 	Don't have VERSION and RELEASE_DATE when compiling the Ghostscript driver.
@@ -18470,6 +24401,13 @@
 
 2001-04-15	<rlk@sourceforge.net>
 
+	Files:	src/gimp/gtk_color_window.c (1.4) (removed)
+		src/gimp/gtk_main_window.c (1.6) (removed)
+
+	Remove the old (GIMP 1.0-compatible) interface.
+
+2001-04-15	<rlk@sourceforge.net>
+
 	Files:	src/main/printers.xml (1.11) (+0 -10)
 
 	Improve quality of Stylus Photo x[789]0.
@@ -18500,10 +24438,26 @@
 
 	Update ID string in output
 
+2001-04-12	<sharkey@sourceforge.net>
+
+	Files:	configure.in.in (1.30) (+10 -22)
+
+	Change some newlines to spaces in the AC_OUTPUT macro.  It should be
+	possible to deliminate fields using any whitespace, but gettext
+	0.10.36 requires spaces around po/Makefile.in.
+
+	Rather than makeing one huge line of text, use mixed delimination, with
+	five reasonably sized lines.  This should work as long as po/Makefile.in
+	is *not* the first or last file on a line.  (Documented in a comment.)
+
+	Ugh.
+
 2001-04-12	<rlk@sourceforge.net>
 
-	Files:	po/POTFILES.in (1.5) (+0 -2)
+	Files:	configure.in.in (1.29) (+2 -2)
+		po/POTFILES.in (1.5) (+0 -2)
 		po/en_GB.po (1.12) (+242 -237)
+		po/en_TEST.po (1.12) (+271 -242)
 		src/gimp/Makefile.am (1.11) (+1 -3)
 		src/gimp/print.c (1.7) (+2 -69)
 		src/gimp/print_gimp.h (1.6) (+1 -13)
@@ -18535,6 +24489,12 @@
 	Removed warnings,
 	corrected passing of private data to flush_pass().
 
+2001-04-09	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.28) (+3 -3)
+
+	Bump version
+
 2001-04-09	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.33) (+2 -2)
@@ -18553,18 +24513,49 @@
 
 	Updated installation instructions from Grant.
 
+2001-04-07	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates/gimp-print.xml (1.1) (added)
+		src/foomatic/foomatic-templates/stp.xml (1.2) (removed)
+
+	Template file should be gimp-print.xml per Grant
+
+2001-04-07	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.13) (+9 -7)
+
+	Don't free up strings used by a gtk_combo.
+
+2001-04-07	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-internal.h (1.28) (+4 -4)
+		src/main/print-dither.c (1.23) (+56 -56)
+
+	Rename stp_dither_get_{first,last}_bit to stp_dither_get_{first,last}_position.
+
 2001-04-06	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.32) (+4 -2)
+	Files:	src/main/gimp-print-internal.h (1.27) (+6 -8)
+		src/main/print-canon.c (1.32) (+4 -2)
+		src/main/print-dither.c (1.22) (+266 -305)
 		src/main/print-escp2.c (1.46) (+3 -2)
 		src/main/print-lexmark.c (1.26) (+10 -10)
 		src/main/print-pcl.c (1.19) (+9 -7)
 
 	Create separate channel structs for each channel in the dither.
 
+2001-04-05	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.21) (+6 -4)
+
+	Improve quality of fast dithering, particularly on plain paper
+
 2001-04-04	<rlk@sourceforge.net>
 
-	Files:	src/main/print-util.c (1.17) (+150 -118)
+	Files:	src/include/gimp-print.h.in (1.7) (+6 -2)
+		src/main/gimp-print-internal.h (1.26) (+4 -2)
+		src/main/print-dither.c (1.20) (+128 -17)
+		src/main/print-util.c (1.17) (+150 -118)
 
 	Add capability for different margins for different paper sizes.
 	to address feature request ID 409612.
@@ -18572,6 +24563,12 @@
 	Dither code records first and last bit in each row that has any ink.
 	This can be used for various optimizations.
 
+2001-04-04	<cpbs@sourceforge.net>
+
+	Files:	doc/README.escp2 (1.2) (+11 -1)
+
+	Discovered a little more about head cleaning commands.
+
 2001-04-03	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.25) (+38 -17)
@@ -18581,7 +24578,15 @@
 
 2001-04-03	<rlk@sourceforge.net>
 
-	Files:	src/main/print-color.c (1.11) (+83 -1)
+	Files:	src/main/print-dither.c (1.19) (+44 -31)
+
+	Improve (I presume) output quality in raw CMYK mode.
+
+2001-04-03	<rlk@sourceforge.net>
+
+	Files:	src/include/gimp-print.h.in (1.6) (+4 -3)
+		src/main/print-color.c (1.11) (+83 -1)
+		src/main/print-dither.c (1.18) (+664 -1)
 		src/main/print-util.c (1.16) (+2 -2)
 
 	Hacked-up raw CMYK output!
@@ -18592,6 +24597,12 @@
 
 	Fix up 720x360
 
+2001-04-03	<rlk@sourceforge.net>
+
+	Files:	debian/README.Debian (1.6) (+1 -1)
+
+	Bump version
+
 2001-04-02	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.24) (+605 -1019)
@@ -18606,7 +24617,10 @@
 	Files:	NEWS (1.15) (+5 -1)
 		README (1.49) (+1 -1)
 		po/en_GB.po (1.11) (+197 -177)
+		po/en_TEST.po (1.11) (+202 -177)
+		src/ghost/README (1.12) (+68 -32)
 		src/main/print-canon.c (1.31) (+3 -1)
+		src/main/print-dither.c (1.17) (+14 -9)
 		src/main/print-escp2.c (1.44) (+179 -99)
 		src/main/print-lexmark.c (1.23) (+2 -1)
 		src/main/print-pcl.c (1.18) (+2 -1)
@@ -18637,14 +24651,20 @@
 
 2001-03-31	<rlk@sourceforge.net>
 
-	Files:	src/gimp/print.c (1.6) (+4 -2)
+	Files:	src/gimp/gimp_color_window.c (1.4) (+7 -6)
+		src/gimp/gimp_main_window.c (1.12) (+9 -9)
+		src/gimp/print.c (1.6) (+4 -2)
+		src/include/gimp-print.h.in (1.5) (+16 -6)
+		src/main/gimp-print-internal.h (1.25) (+3 -3)
 		src/main/print-canon.c (1.30) (+6 -4)
 		src/main/print-color.c (1.10) (+819 -660)
+		src/main/print-dither.c (1.16) (+249 -265)
 		src/main/print-escp2.c (1.43) (+6 -4)
 		src/main/print-lexmark.c (1.22) (+39 -37)
 		src/main/print-pcl.c (1.17) (+6 -4)
 		src/main/print-ps.c (1.9) (+7 -5)
 		src/main/print-util.c (1.15) (+19 -32)
+		src/printdef/printdef.h (1.5) (+7 -1)
 		test/.cvsignore (1.2) (+1 -0)
 
 	Stage 1 CMYK conversion: switch the color core over to using CMY
@@ -18654,7 +24674,8 @@
 
 2001-03-26	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.29) (+2 -2)
+	Files:	src/main/gimp-print-internal.h (1.24) (+14 -4)
+		src/main/print-canon.c (1.29) (+2 -2)
 		src/main/print-escp2.c (1.42) (+3 -2)
 		src/main/print-pcl.c (1.16) (+2 -2)
 		src/main/print-weave.c (1.20) (+26 -8)
@@ -18665,6 +24686,7 @@
 2001-03-26	<rlk@sourceforge.net>
 
 	Files:	README (1.48) (+24 -0)
+		src/main/gimp-print-internal.h (1.23) (+25 -10)
 		src/main/print-escp2.c (1.41) (+3 -2)
 		src/main/print-weave.c (1.19) (+70 -34)
 		test/escp2-weavetest.c (1.15) (+3 -2)
@@ -18676,32 +24698,58 @@
 2001-03-24	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.10) (+96 -96)
+		po/en_TEST.po (1.10) (+96 -96)
 		src/foomatic/Makefile.am (1.3) (+2 -2)
 
 	Fix up foomatic some more.
 
 2001-03-24	<rlk@sourceforge.net>
 
-	Files:	po/POTFILES.in (1.4) (+3 -1)
+	Files:	configure.in.in (1.27) (+21 -2)
+		po/POTFILES.in (1.4) (+3 -1)
 		src/foomatic/Makefile.am (1.2) (+18 -2)
 
 	Fix up foomatic stuff; we just need the last little bits of data.
 
 2001-03-24	<rlk@sourceforge.net>
 
-	Files:	src/Makefile.am (1.2) (+2 -2)
-		src/foomatic/.cvsignore (1.1) ( )
-		src/foomatic/Makefile.am (1.1) ( )
-		src/foomatic/foomatic-generator.in (1.1) ( )
-		src/foomatic/foomatic-printermap (1.1) ( )
-		src/foomatic/printer_options.c (1.1) ( )
+	Files:	configure.in.in (1.26) (+16 -1)
+		src/Makefile.am (1.2) (+2 -2)
+		src/foomatic/.cvsignore (1.1) (added)
+		src/foomatic/Makefile.am (1.1) (added)
+		src/foomatic/foomatic-generator.in (1.1) (added)
+		src/foomatic/foomatic-printermap (1.1) (added)
+		src/foomatic/foomatic-templates/Brightness.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Contrast.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Cyan.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Density.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Dither.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Gamma.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Greyscale.xml (1.1) (added)
+		src/foomatic/foomatic-templates/ImageType.xml (1.1) (added)
+		src/foomatic/foomatic-templates/InkType.xml (1.1) (added)
+		src/foomatic/foomatic-templates/InputSlot.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Magenta.xml (1.1) (added)
+		src/foomatic/foomatic-templates/MediaType.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Model.xml (1.1) (added)
+		src/foomatic/foomatic-templates/PageSize.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Quality.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Resolution.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Saturation.xml (1.1) (added)
+		src/foomatic/foomatic-templates/Yellow.xml (1.1) (added)
+		src/foomatic/foomatic-templates/stp.xml (1.1) (added)
+		src/foomatic/printer_options.c (1.1) (added)
 		test/Makefile.am (1.13) (+2 -6)
+		test/printer_options.c (1.7) (removed)
 
 	Start adding foomatic back in.
 
 2001-03-24	<rlk@sourceforge.net>
 
-	Files:	src/main/print-color.c (1.9) (+19 -19)
+	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)
+		src/main/print-dither.c (1.15) (+19 -10)
 		src/main/print-escp2.c (1.40) (+2 -2)
 
 	Cleanup in the Gimp driver
@@ -18728,6 +24776,34 @@
 	it this way.
 	Fixed minor bugs in bjc-unprint.
 
+2001-03-20	<sharkey@sourceforge.net>
+
+	Files:	scripts/buildgimpprintdebs (1.1) (added)
+
+	Handy script for building Gimp Print debian packages for use with
+	cvs-buildpackage.  Care should be used when running this script as
+	it assumes that the directory you're running in is the top of the
+	gimp-print source tree and that the copy is a scratch directory (it
+	will delete some files).
+
+2001-03-20	<sharkey@sourceforge.net>
+
+	Files:	debian/changelog (1.12) (+8 -0)
+		debian/cupsys-driver-gimpprint.docs (1.4) (+0 -1)
+		debian/rules (1.15) (+4 -7)
+
+	Merge in changes from Debian branch.  Not much is changed, except the
+	NEWS file is used in place of the ChangeLog file.
+
+2001-03-20	<sharkey@sourceforge.net>
+
+	Files:	debian/.cvsignore (1.4) (+9 -0)
+
+	Resurrect .cvsignore, and add a few more entries, too.
+
+	This should have been resurrected a log time ago, but I missed it because
+	is began with a ".".
+
 2001-03-19	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.26) (+2 -2)
@@ -18748,6 +24824,12 @@
 
 	Fix custom paper size.
 
+2001-03-16	<rleigh@sourceforge.net>
+
+	Files:	debian/control.in (1.2) (+1 -1)
+
+	Add alternative dependency on ESP cups packages for cupsys-driver-gimpprint
+
 2001-03-15	<cpbs@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.39) (+91 -79)
@@ -18758,13 +24840,34 @@
 
 2001-03-13	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.9) (+68 -68)
+	Files:	debian/rules (1.14) (+17 -8)
+		po/en_GB.po (1.9) (+68 -68)
+		po/en_TEST.po (1.9) (+73 -70)
 
 	Restore CVS build. Call autogen.sh properly.
 
+2001-03-12	<rleigh@sourceforge.net>
+
+	Files:	debian/rules (1.13) (+2 -4)
+
+	Remove dependency on configure.in.in
+
+2001-03-12	<rleigh@sourceforge.net>
+
+	Files:	debian/rules (1.12) (+4 -4)
+
+	Fix autogen.sh not being run in debian/rules
+
+2001-03-12	<rleigh@sourceforge.net>
+
+	Files:	debian/rules (1.11) (+4 -2)
+
+	Run autogen.sh safely
+
 2001-03-12	<gandy@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.24) (+391 -62)
+	Files:	doc/README.new-printer (1.2) (+18 -5)
+		src/main/print-canon.c (1.24) (+391 -62)
 
 	Added HSL correction copying from espc2 driver as suggested by Robert
 
@@ -18784,7 +24887,8 @@
 
 2001-03-10	<rleigh@sourceforge.net>
 
-	Files:	src/main/print-util.c (1.13) (+6 -6)
+	Files:	src/main/gimp-print-internal.h (1.22) (+2 -6)
+		src/main/print-util.c (1.13) (+6 -6)
 
 	Simplify vasprintf conditional compilation
 
@@ -18794,18 +24898,15 @@
 
 	Switch the color mode to monochrome when printing to a black & white printer.
 
-2001-03-10	<rlk@sourceforge.net>
-
-	Files:	acconfig.h (1.9.4.1) (+2 -1)
-
-	Intermediate merge up with mainline
-
 2001-03-09	<rleigh@sourceforge.net>
 
 	Files:	acconfig.h (1.10) (+2 -1)
+		configure.in.in (1.25) (+6 -2)
 		src/main/Makefile.am (1.16) (+2 -2)
+		src/main/gimp-print-internal.h (1.21) (+7 -2)
 		src/main/print-canon.c (1.22) (+11 -11)
 		src/main/print-color.c (1.8) (+6 -6)
+		src/main/print-dither.c (1.14) (+14 -14)
 		src/main/print-escp2.c (1.38) (+13 -13)
 		src/main/print-lexmark.c (1.20) (+11 -11)
 		src/main/print-pcl.c (1.14) (+17 -17)
@@ -18819,7 +24920,9 @@
 2001-03-08	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.92) (+23 -10)
+		debian/rules (1.10) (+8 -5)
 		po/en_GB.po (1.8) (+96 -96)
+		po/en_TEST.po (1.8) (+96 -96)
 
 	ChangeLog generating is more strict
 	Debian packaging requires ChangeLog, and will package ChangeLog
@@ -18855,7 +24958,12 @@
 
 2001-03-05	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.7) (+1 -1)
+	Files:	debian/control (1.10) (removed)
+		debian/control.in (1.1) (added)
+		debian/rules (1.9) (+10 -10)
+		lib/xmalloc.c (1.3) (+4 -4)
+		po/en_GB.po (1.7) (+1 -1)
+		po/en_TEST.po (1.7) (+1 -1)
 
 	Automagically generate debian/control
 	tidy lib/xmalloc.c
@@ -18866,12 +24974,6 @@
 
 	Removed dead code ("empty" variable).
 
-2001-03-05	<sharkey@sourceforge.net>
-
-	Files:	acconfig.h (1.8.2.1) (+7 -3)
-
-	Update the debian branch to the 4.1.5 release.
-
 2001-03-05	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.18) (+5 -4)
@@ -18922,6 +25024,19 @@
 
 	4.1.5 release
 
+2001-03-04	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.10) (+18 -25)
+
+	Previous change is not working properly in all cases -- back out.
+
+2001-03-04	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.9) (+26 -19)
+
+	If resolution is invalid, pick printer default rather than current
+	resolution on the list.
+
 2001-03-04	<wollvieh@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.35) (+11 -8)
@@ -18938,15 +25053,38 @@
 
 	Files:	NEWS (1.12) (+4 -1)
 		po/en_GB.po (1.6) (+173 -173)
+		po/en_TEST.po (1.6) (+173 -173)
 		src/main/print-escp2.c (1.34) (+7 -7)
 
 	Update for the Stylus Color 900/980.
 
 	Update 4.1.5 release notes.
 
+2001-03-03	<sharkey@sourceforge.net>
+
+	Files:	debian/changelog (1.11) (+3 -2)
+
+	Since I'm not uploading 4.1.4, the ITP bug closure notice should be moved
+	up to 4.1.5-1.
+
+2001-03-02	<sharkey@sourceforge.net>
+
+	Files:	debian/control (1.9) (+3 -3)
+		debian/libgimpprint.files (1.5) (+0 -0)
+		debian/libgimpprint.postinst (1.5) (+0 -0)
+		debian/libgimpprint4.1.5.files (1.2) (removed)
+		debian/libgimpprint4.1.5.postinst (1.2) (removed)
+		debian/rules (1.8) (+12 -4)
+
+	Merge in changes from the debian-branch to reduce the number of hard-coded
+	version numbers.
+
 2001-03-02	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.14) (+139 -139)
+	Files:	src/include/gimp-print.h.in (1.4) (+5 -5)
+		src/main/gimp-print-internal.h (1.20) (+18 -12)
+		src/main/print-canon.c (1.14) (+139 -139)
+		src/main/print-dither.c (1.13) (+22 -21)
 		src/main/print-escp2.c (1.33) (+96 -95)
 		src/main/print-lexmark.c (1.18) (+68 -68)
 		src/main/print-pcl.c (1.13) (+73 -73)
@@ -18972,8 +25110,9 @@
 
 2001-03-01	<gandy@sourceforge.net>
 
-	Files:	test/Makefile.am (1.12) (+4 -2)
-		test/bjc-unprint.c (1.1) ( )
+	Files:	configure.in.in (1.24) (+2 -2)
+		test/Makefile.am (1.12) (+4 -2)
+		test/bjc-unprint.c (1.1) (added)
 
 	Added bjc-unprint.c to convert Canon-BJC printjobs to one xbm per color channel
 
@@ -18993,9 +25132,24 @@
 
 	Distribute debian directory with 'dist-hook'
 
+2001-02-28	<sharkey@sourceforge.net>
+
+	Files:	debian/changelog (1.10) (+10 -1)
+		debian/control (1.8) (+6 -6)
+		debian/gimp1.2-print.docs (1.4) (+0 -4)
+		debian/libgimpprint-dev.docs (1.2) (+6 -0)
+		debian/libgimpprint.docs (1.4) (removed)
+		debian/libgimpprint.files (1.4) (removed)
+		debian/libgimpprint.postinst (1.4) (removed)
+		debian/libgimpprint4.1.5.files (1.1) (added)
+		debian/libgimpprint4.1.5.postinst (1.1) (added)
+		debian/rules (1.7) (+3 -8)
+
+	Merge changes made on the debian branch into the mainline.
+
 2001-02-28	<gandy@sourceforge.net>
 
-	Files:	test/parse-bjc (1.1) ( )
+	Files:	test/parse-bjc (1.1) (added)
 
 	* Added parse-bjc (a modified parse-escp) to view Canon-BJC print files
 	  As default, only the header and the footer of the printjob are printed,
@@ -19006,6 +25160,8 @@
 2001-02-28	<rlk@sourceforge.net>
 
 	Files:	po/en_GB.po (1.5) (+253 -255)
+		po/en_TEST.po (1.5) (+253 -255)
+		src/main/gimp-print-internal.h (1.19) (+3 -2)
 		src/main/print-weave.c (1.15) (+47 -11)
 		test/escp2-weavetest.c (1.13) (+43 -17)
 		test/run-weavetest (1.5) (+1 -1)
@@ -19014,6 +25170,24 @@
 	exceeds the number of jets, as long as the horizontal oversampling does
 	not exceed the number of jets.
 
+2001-02-27	<sharkey@sourceforge.net>
+
+	Files:	debian/libgimpprint4.1.4.postinst (1.1) (added)
+
+	file libgimpprint4.1.4.postinst was initially added on branch debian-branch.
+
+2001-02-27	<sharkey@sourceforge.net>
+
+	Files:	debian/libgimpprint4.1.4.files (1.1) (added)
+
+	file libgimpprint4.1.4.files was initially added on branch debian-branch.
+
+2001-02-27	<sharkey@sourceforge.net>
+
+	Files:	debian/libgimpprint-dev.docs (1.1) (added)
+
+	file libgimpprint-dev.docs was initially added on branch debian-branch.
+
 2001-02-27	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.13) (+308 -130)
@@ -19061,6 +25235,32 @@
 
 	Handle remote mode commands
 
+2001-02-25	<sharkey@sourceforge.net>
+
+	Files:	debian/README.Debian (1.5) (+0 -0)
+		debian/README.building.from.CVS (1.6) (+0 -0)
+		debian/changelog (1.9) (+0 -0)
+		debian/control (1.7) (+0 -0)
+		debian/copyright (1.3) (+0 -0)
+		debian/cupsys-driver-gimpprint.conffiles (1.4) (+0 -0)
+		debian/cupsys-driver-gimpprint.docs (1.3) (+0 -0)
+		debian/cupsys-driver-gimpprint.files (1.4) (+0 -0)
+		debian/cupsys-driver-gimpprint.postrm (1.3) (+0 -0)
+		debian/escputil.docs (1.3) (+0 -0)
+		debian/escputil.files (1.3) (+0 -0)
+		debian/gimp1.2-print.doc-base (1.3) (+0 -0)
+		debian/gimp1.2-print.docs (1.3) (+0 -0)
+		debian/gimp1.2-print.postrm (1.4) (+0 -0)
+		debian/gimp1.2-print.preinst (1.4) (+0 -0)
+		debian/libgimpprint-dev.files (1.3) (+0 -0)
+		debian/libgimpprint.docs (1.3) (+0 -0)
+		debian/libgimpprint.files (1.3) (+0 -0)
+		debian/libgimpprint.postinst (1.3) (+0 -0)
+		debian/rules (1.6) (+0 -0)
+
+	Return the debian directory to what it was on February 22 8:00 AM EST
+	before I removed it.
+
 2001-02-25	<rleigh@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.12) (+5 -5)
@@ -19071,12 +25271,21 @@
 
 	Files:	src/cups/rastertoprinter.c (1.11) (+3 -3)
 		src/escputil/escputil.c (1.9) (+2 -2)
+		src/ghost/gdevstp.c (1.5) (+2 -2)
+		src/gimp/gimp_main_window.c (1.8) (+4 -4)
+		src/include/gimp-print.h.in (1.3) (+4 -4)
+		src/main/gimp-print-internal.h (1.18) (+3 -3)
 		src/main/print-canon.c (1.12) (+20 -423)
 		src/main/print-color.c (1.7) (+3 -3)
+		src/main/print-dither.c (1.12) (+3 -3)
 		src/main/print-lexmark.c (1.17) (+139 -139)
 		src/main/print-pcl.c (1.11) (+3 -3)
 		src/main/print-util.c (1.10) (+8 -8)
 		src/main/print-weave.c (1.14) (+12 -12)
+		src/main/quickmatrix257.h (1.2) (+2 -2)
+		src/main/ran.367.179.h (1.2) (+2 -2)
+		src/main/ran.509.131.h (1.2) (+2 -2)
+		src/printdef/printdefy.y (1.3) (+3 -3)
 		test/escp2-weavetest.c (1.12) (+4 -4)
 		test/testdither.c (1.6) (+3 -3)
 		test/unprint.c (1.3) (+3 -3)
@@ -19109,7 +25318,8 @@
 
 2001-02-24	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.28) (+12 -11)
+	Files:	src/main/gimp-print-internal.h (1.17) (+3 -3)
+		src/main/print-escp2.c (1.28) (+12 -11)
 		test/escp2-weavetest.c (1.11) (+2 -4)
 		test/run-weavetest (1.4) (+4 -1)
 
@@ -19142,13 +25352,23 @@
 
 2001-02-24	<rlk@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.9) (+44 -37)
+	Files:	configure.in.in (1.23) (+3 -3)
+		src/cups/genppd.c (1.9) (+44 -37)
 		src/cups/rastertoprinter.c (1.10) (+46 -47)
+		src/ghost/README (1.10) (+1 -1)
+		src/ghost/gdevstp.c (1.4) (+159 -236)
+		src/gimp/gimp_color_window.c (1.3) (+69 -69)
+		src/gimp/gimp_main_window.c (1.7) (+270 -274)
+		src/gimp/gtk_color_window.c (1.3) (+106 -97)
+		src/gimp/gtk_main_window.c (1.5) (+231 -228)
 		src/gimp/print.c (1.5) (+240 -254)
 		src/gimp/print_gimp.h (1.5) (+2 -2)
+		src/include/gimp-print.h.in (1.2) (+175 -131)
 		src/main/Makefile.am (1.14) (+2 -2)
+		src/main/gimp-print-internal.h (1.16) (+15 -8)
 		src/main/print-canon.c (1.11) (+79 -74)
 		src/main/print-color.c (1.6) (+88 -87)
+		src/main/print-dither.c (1.11) (+5 -5)
 		src/main/print-escp2.c (1.26) (+190 -166)
 		src/main/print-lexmark.c (1.16) (+90 -89)
 		src/main/print-pcl.c (1.9) (+75 -68)
@@ -19156,6 +25376,9 @@
 		src/main/print-util.c (1.9) (+452 -110)
 		src/main/print-weave.c (1.13) (+2 -2)
 		src/main/printers.xml (1.10) (+1 -1)
+		src/printdef/printdef.h (1.4) (+63 -2)
+		src/printdef/printdefy.y (1.2) (+7 -8)
+		test/printer_options.c (1.6) (+7 -6)
 
 	Convert the interface to the internal data structures to be
 	procedural (via accessors and mutators) rather than data, to
@@ -19165,10 +25388,50 @@
 
 	Fix the page dimensions of some older Epson printers.
 
+2001-02-22	<sharkey@sourceforge.net>
+
+	Files:	debian/.cvsignore (1.3) (removed)
+
+	Really, I mean it now, remove this file from the main trunk!
+
+2001-02-22	<sharkey@sourceforge.net>
+
+	Files:	debian/README.building.from.CVS (1.5) (removed)
+
+	Forgot one...
+
+	Remove Debian specific files from main trunk.
+
+2001-02-22	<sharkey@sourceforge.net>
+
+	Files:	debian/README.Debian (1.4) (removed)
+		debian/changelog (1.8) (removed)
+		debian/control (1.6) (removed)
+		debian/copyright (1.2) (removed)
+		debian/cupsys-driver-gimpprint.conffiles (1.3) (removed)
+		debian/cupsys-driver-gimpprint.docs (1.2) (removed)
+		debian/cupsys-driver-gimpprint.files (1.3) (removed)
+		debian/cupsys-driver-gimpprint.postrm (1.2) (removed)
+		debian/escputil.docs (1.2) (removed)
+		debian/escputil.files (1.2) (removed)
+		debian/gimp1.2-print.doc-base (1.2) (removed)
+		debian/gimp1.2-print.docs (1.2) (removed)
+		debian/gimp1.2-print.postrm (1.3) (removed)
+		debian/gimp1.2-print.preinst (1.3) (removed)
+		debian/libgimpprint-dev.files (1.2) (removed)
+		debian/libgimpprint.docs (1.2) (removed)
+		debian/libgimpprint.files (1.2) (removed)
+		debian/libgimpprint.postinst (1.2) (removed)
+		debian/rules (1.5) (removed)
+
+	Remove Debian specific files from the main trunk.
+
 2001-02-21	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.90) (+15 -2)
+		configure.in.in (1.22) (+13 -1)
 		po/en_GB.po (1.4) (+118 -98)
+		po/en_TEST.po (1.4) (+123 -98)
 
 	Added 'gimp-dist' target to package for the GIMP
 
@@ -19182,14 +25445,18 @@
 
 2001-02-21	<rleigh@sourceforge.net>
 
-	Files:	scripts/autogen.sh (1.6) (+5 -1)
+	Files:	debian/changelog (1.7) (+6 -0)
+		debian/control (1.5) (+2 -2)
+		debian/rules (1.4) (+3 -3)
+		scripts/autogen.sh (1.6) (+5 -1)
 
 	Bump debian version
 	Make scripts/autogen.sh aclocal magic portable
 
 2001-02-19	<rleigh@sourceforge.net>
 
-	Files:	doc/README.maintaining (1.4) (+112 -7)
+	Files:	configure.in.in (1.21) (+1 -4)
+		doc/README.maintaining (1.4) (+112 -7)
 		scripts/autogen.sh (1.5) (+3 -1)
 
 	Fix AM_PATH_GIMPPRINT duplication bug
@@ -19205,6 +25472,8 @@
 
 	Files:	NEWS (1.9) (+4 -1)
 		README (1.47) (+4 -42)
+		configure.in.in (1.20) (+3 -3)
+		debian/README.Debian (1.3) (+1 -1)
 		doc/README.maintaining (1.2) (+10 -0)
 
 	Clean up the build instructions slightly.
@@ -19215,14 +25484,21 @@
 
 	Files:	acconfig.h (1.9) (+7 -3)
 		autogen.sh (1.3) (+1 -1)
-		doc/README.maintaining (1.1) ( )
+		configure.in.in (1.19) (+28 -13)
+		debian/rules (1.3) (+8 -3)
+		doc/README.maintaining (1.1) (added)
 		src/cups/Makefile.am (1.18) (+2 -2)
 		src/cups/genppd.c (1.8) (+6 -2)
 		src/cups/rastertoprinter.c (1.9) (+6 -2)
 		src/gimp/Makefile.am (1.10) (+3 -2)
 		src/gimp/print_gimp.h (1.4) (+5 -1)
+		src/include/Makefile.am (1.7) (+3 -2)
+		src/include/gimp-print.h (1.6) (removed)
+		src/include/gimp-print.h.in (1.1) (added)
+		src/main/gimpprint.m4 (1.5) (+1 -1)
 		test/Makefile.am (1.10) (+2 -2)
 		test/escp2-weavetest.c (1.10) (+5 -1)
+		test/printer_options.c (1.5) (+5 -1)
 		test/testdither.c (1.5) (+6 -2)
 
 	--disable-libgimpprint will use installed headers, and supplied CFLAGS and
@@ -19240,6 +25516,18 @@
 
 2001-02-19	<rlk@sourceforge.net>
 
+	Files:	gimp.m4 (1.3) (+0 -0)
+
+	Add gimp.m4 here to allow autogen/aclocal to run where gimp is not installed
+
+2001-02-19	<rlk@sourceforge.net>
+
+	Files:	configure.in.in (1.18) (+2 -1)
+
+	Need aclocal -I src/main
+
+2001-02-19	<rlk@sourceforge.net>
+
 	Files:	src/ghost/Makefile.am (1.7) (+1 -2)
 
 	Ghostscript doesn't have its own ChangeLog
@@ -19252,7 +25540,8 @@
 
 2001-02-19	<rlk@sourceforge.net>
 
-	Files:	scripts/autogen.sh (1.4) (+1 -1)
+	Files:	configure.in.in (1.17) (+3 -1)
+		scripts/autogen.sh (1.4) (+1 -1)
 
 	Allow aclocal to find gimpprint.m4
 
@@ -19265,7 +25554,15 @@
 
 2001-02-18	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.13) (+2 -2)
+	Files:	configure.in.in (1.16) (+2 -2)
+
+	Make --disable-libgimpprint use current source version in check
+
+2001-02-18	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.15) (+7 -2)
+		src/main/Makefile.am (1.13) (+2 -2)
+		src/main/gimpprint.m4 (1.4) (+5 -5)
 
 	Enable --disable-libgimpprint (link with previously installed version)
 	Update gimppprint.m4 (help message alignment fixed)
@@ -19273,6 +25570,7 @@
 2001-02-18	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.8) (+2 -1)
+		src/ghost/README (1.9) (+1 -0)
 		src/main/print-escp2.c (1.24) (+2 -2)
 		src/main/printers.xml (1.9) (+9 -0)
 
@@ -19281,6 +25579,7 @@
 2001-02-18	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.7) (+3 -1)
+		src/ghost/README (1.8) (+2 -0)
 		src/main/print-escp2.c (1.23) (+15 -1)
 		src/main/printers.xml (1.8) (+10 -0)
 		test/run-weavetest (1.3) (+15 -11)
@@ -19292,17 +25591,16 @@
 
 2001-02-18	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.95.2.1) (+2 -1)
+	Files:	NEWS (1.7) (+48 -0)
 
-	Eliminate any possibility of black speckling in white areas (from
-	mainline).
+	Initial release notes for 4.1.4 (Debian and internationalization need
+	to be filled in).
 
 2001-02-18	<rlk@sourceforge.net>
 
-	Files:	NEWS (1.7) (+48 -0)
+	Files:	debian/README.Debian (1.2) (+1 -1)
 
-	Initial release notes for 4.1.4 (Debian and internationalization need
-	to be filled in).
+	Bump version
 
 2001-02-18	<rlk@sourceforge.net>
 
@@ -19316,9 +25614,16 @@
 
 	Tune 980 and, to some degree, 900
 
+2001-02-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.10) (+2 -1)
+
+	Eliminate bogus black speckling in areas with zero black component.
+
 2001-02-18	<wollvieh@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.21) (+39 -6)
+	Files:	src/main/gimp-print-internal.h (1.15) (+3 -9)
+		src/main/print-escp2.c (1.21) (+39 -6)
 		src/main/print-weave.c (1.12) (+21 -26)
 		test/escp2-weavetest.c (1.9) (+13 -2)
 
@@ -19338,10 +25643,13 @@
 2001-02-17	<rleigh@sourceforge.net>
 
 	Files:	acconfig.h (1.8) (+2 -1)
+		configure.in.in (1.14) (+35 -28)
+		debian/control (1.4) (+1 -1)
 		src/cups/Makefile.am (1.16) (+4 -4)
 		src/ghost/Makefile.am (1.6) (+2 -2)
 		src/gimp/Makefile.am (1.9) (+4 -4)
 		src/main/Makefile.am (1.12) (+5 -13)
+		src/main/gimpprint-config.in (1.2) (+5 -2)
 		src/main/print-version.c (1.2) (+2 -1)
 		test/Makefile.am (1.9) (+5 -5)
 
@@ -19351,6 +25659,12 @@
 
 2001-02-17	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.7) (+4 -0)
+
+	Some printer updates
+
+2001-02-17	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.10) (+14 -1)
 
 	Add nominal support for Canon BJC6500
@@ -19364,6 +25678,12 @@
 
 2001-02-17	<rlk@sourceforge.net>
 
+	Files:	src/main/gimp-print-internal.h (1.14) (+2 -6)
+
+	Clean up dead declaration
+
+2001-02-17	<rlk@sourceforge.net>
+
 	Files:	src/gimp/print.c (1.4) (+2 -26)
 
 	Remove dead support for wrting old printrc format
@@ -19374,25 +25694,61 @@
 
 	Clean up potential buffer overflow
 
+2001-02-17	<rlk@sourceforge.net>
+
+	Files:	src/ghost/gdevstp.c (1.3) (+8 -4)
+
+	Clean up potential buffer overflows
+
 2001-02-17	<rwisi@sourceforge.net>
 
 	Files:	src/main/printers.xml (1.6) (+11 -0)
 
 	Added Lexmark Z31 to the list (not tested, received comment that the 3200 driver is working with the Z31)
 
+2001-02-17	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-internal.h (1.13) (+8 -23)
+
+	Remove a few more bogon declarations
+
+2001-02-17	<rlk@sourceforge.net>
+
+	Files:	src/main/gimp-print-internal.h (1.12) (+4 -10)
+
+	Remove spurious declarations
+
 2001-02-17	<wollvieh@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.20) (+64 -11)
+	Files:	src/main/gimp-print-internal.h (1.11) (+39 -11)
+		src/main/print-escp2.c (1.20) (+64 -11)
 		src/main/print-weave.c (1.10) (+153 -115)
 		src/main/printers.xml (1.5) (+9 -9)
 		test/escp2-weavetest.c (1.7) (+3 -2)
 
 	added stylus color 480 support
 
+2001-02-17	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.13) (+7 -3)
+
+	Modify library versioning scheme to use sensible major number
+
 2001-02-16	<rleigh@sourceforge.net>
 
-	Files:	man/Makefile.am (1.4) (+3 -3)
-		man/cups-calibrate.8.in (1.1) ( )
+	Files:	configure.in.in (1.12) (+2 -1)
+		debian/README.building.from.CVS (1.4) (+3 -22)
+		debian/changelog (1.6) (+3 -2)
+		debian/control (1.3) (+1 -1)
+		debian/cupsys-driver-gimpprint.files (1.2) (+1 -0)
+		debian/cupsys-driver-gimpprint.undocumented (1.2) (removed)
+		debian/postinst.ex (1.2) (removed)
+		debian/postrm.ex (1.2) (removed)
+		debian/preinst.ex (1.2) (removed)
+		debian/prerm.ex (1.2) (removed)
+		debian/rules (1.2) (+1 -0)
+		man/Makefile.am (1.4) (+3 -3)
+		man/cups-calibrate.8.in (1.1) (added)
 
 	Debian build is lintian-clean and uses the right library versioning scheme.
 	Added cups-calibrate man page.
@@ -19400,6 +25756,7 @@
 2001-02-15	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.6) (+2 -1)
+		src/ghost/README (1.6) (+1 -0)
 		src/main/print-escp2.c (1.19) (+2 -2)
 		src/main/printers.xml (1.4) (+9 -0)
 
@@ -19407,7 +25764,21 @@
 
 2001-02-14	<rlk@sourceforge.net>
 
+	Files:	src/ghost/contrib.mak.addon (1.4) (+2 -0)
+		src/ghost/devs.mak.addon-5.10 (1.4) (+2 -0)
+
+	Add warning about how to use this file.
+
+2001-02-14	<rlk@sourceforge.net>
+
+	Files:	src/ghost/README (1.5) (+33 -27)
+
+	Some updates
+
+2001-02-14	<rlk@sourceforge.net>
+
 	Files:	acconfig.h (1.7) (+3 -1)
+		configure.in.in (1.11) (+2 -1)
 		src/main/print-canon.c (1.9) (+2 -2)
 		src/main/print-escp2.c (1.18) (+10 -3)
 		src/main/print-lexmark.c (1.15) (+2 -2)
@@ -19419,6 +25790,20 @@
 	Add 1440x360 modes to Epson printers.  These are only enabled if
 	maintainer mode is enabled.
 
+2001-02-13	<rleigh@sourceforge.net>
+
+	Files:	debian/README.building.from.CVS (1.3) (+7 -4)
+		debian/changelog (1.5) (+5 -3)
+		debian/control (1.2) (+1 -1)
+		debian/cupsys-driver-gimpprint.postrm (1.1) (added)
+		debian/gimp1.2-print.postrm (1.2) (+1 -1)
+		debian/gimp1.2-print.preinst (1.2) (+1 -1)
+		po/ChangeLog (1.3) (+2 -13)
+
+	Fixed cupsys-driver-gimpprint postrm
+	Fixed gimp1.2-print dependencies
+	Add pointer to main ChangeLog from po/ChangeLog
+
 2001-02-13	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.5) (+33 -65)
@@ -19440,10 +25825,23 @@
 2001-02-13	<rlk@sourceforge.net>
 
 	Files:	acconfig.h (1.6) (+2 -1)
+		configure.in.in (1.10) (+2 -1)
 		src/escputil/escputil.c (1.3) (+42 -7)
 
 	Speed up escputil by using poll if available.
 
+2001-02-12	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.9) (+5 -3)
+		cups/.cvsignore (1.6) (removed)
+		debian/.cvsignore (1.2) (+0 -2)
+		debian/control (1.1) (added)
+		debian/rules (1.1) (added)
+
+	Add debian/rules, debian/control and update debian/.cvsignore
+	Add error message to cups library checks in configure.in.in
+	Remove redundant cups/.cvsignore
+
 2001-02-12	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.17) (+29 -28)
@@ -19452,9 +25850,19 @@
 
 	Rename MODEL_INIT_900 to MODEL_INIT_NEW
 
+2001-02-11	<rleigh@sourceforge.net>
+
+	Files:	debian/changelog (1.4) (+5 -2)
+		debian/cupsys-driver-gimpprint.conffiles (1.2) (+1 -1)
+
+	Fix cupsys-driver-gimpprint conffiles
+
 2001-02-11	<rlk@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.16) (+2 -2)
+	Files:	src/ghost/README (1.4) (+1 -0)
+		src/main/gimp-print-internal.h (1.10) (+13 -2)
+		src/main/print-dither.c (1.9) (+128 -51)
+		src/main/print-escp2.c (1.16) (+2 -2)
 		src/main/printers.xml (1.3) (+8 -0)
 
 	Permit use of external dither matrix
@@ -19462,9 +25870,20 @@
 	Add new Epson 83 printer -- appears to be more or less a clone of the
 	880?
 
+2001-02-11	<rleigh@sourceforge.net>
+
+	Files:	debian/cupsys-driver-gimpprint.conffiles (1.1) (added)
+		debian/doc-base.gimp1.2-print (1.2) (removed)
+		debian/gimp1.2-print.doc-base (1.1) (added)
+
+	Fixed doc-base files in gimp1.2-print
+	Add conffile for cupsys-driver-gimpprint
+
 2001-02-11	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.8) (+3 -8)
+	Files:	src/main/gimp-print-internal.h (1.9) (+8 -15)
+		src/main/print-canon.c (1.8) (+3 -8)
+		src/main/print-dither.c (1.8) (+49 -38)
 		src/main/print-escp2.c (1.15) (+3 -8)
 		src/main/print-lexmark.c (1.14) (+3 -15)
 		src/main/print-pcl.c (1.8) (+3 -12)
@@ -19472,6 +25891,18 @@
 	Create a single dither function that decides what to do, rather than
 	each driver having to make the same decision.
 
+2001-02-10	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.8) (+2 -2)
+		debian/README.building.from.CVS (1.2) (+27 -30)
+		man/gimpprint-config.1.in (1.1) (added)
+		src/main/gimpprint.m4 (1.3) (+25 -23)
+
+	configure.in.in: fix test typo
+	debian/README.building.from.CVS: updated build instructions
+	src/main/gimpprint.m4: updated names and error reporting
+	Add man/gimpprint-config.1.in
+
 2001-02-10	<rlk@sourceforge.net>
 
 	Files:	test/escp2-weavetest.c (1.6) (+33 -27)
@@ -19480,11 +25911,40 @@
 
 2001-02-10	<rleigh@sourceforge.net>
 
-	Files:	man/Makefile.am (1.3) (+3 -3)
+	Files:	debian/README.Debian (1.1) (added)
+		debian/changelog (1.3) (+14 -0)
+		debian/copyright (1.1) (added)
+		debian/cupsys-driver-gimpprint.docs (1.1) (added)
+		debian/cupsys-driver-gimpprint.files (1.1) (added)
+		debian/cupsys-driver-gimpprint.undocumented (1.1) (added)
+		debian/doc-base.gimp1.2-print (1.1) (added)
+		debian/escputil.docs (1.1) (added)
+		debian/escputil.files (1.1) (added)
+		debian/gimp1.2-print.docs (1.1) (added)
+		debian/gimp1.2-print.postrm (1.1) (added)
+		debian/gimp1.2-print.preinst (1.1) (added)
+		debian/libgimpprint-dev.files (1.1) (added)
+		debian/libgimpprint.docs (1.1) (added)
+		debian/libgimpprint.files (1.1) (added)
+		debian/libgimpprint.postinst (1.1) (added)
+		debian/packages (1.3) (removed)
+		debian/postinst.ex (1.1) (added)
+		debian/postrm.ex (1.1) (added)
+		debian/preinst.ex (1.1) (added)
+		debian/prerm.ex (1.1) (added)
+
+	Added new debian packaging
+
+2001-02-10	<rleigh@sourceforge.net>
+
+	Files:	configure.in.in (1.7) (+6 -3)
+		man/Makefile.am (1.3) (+3 -3)
 		man/escputil.1.in (1.2) (+1 -1)
 		po/en_GB.po (1.3) (+22 -11)
+		po/en_TEST.po (1.3) (+23 -11)
 		scripts/autogen.sh (1.3) (+1 -1)
 		src/main/Makefile.am (1.11) (+2 -2)
+		src/main/gimpprint.m4 (1.2) (+1 -0)
 
 	Added gimpprint-config manpage
 	Updated escputil.1.in to automatically add the release date and version
@@ -19501,6 +25961,13 @@
 
 2001-02-10	<rlk@sourceforge.net>
 
+	Files:	src/cups/ChangeLog (1.2) (removed)
+		src/ghost/ChangeLog (1.2) (removed)
+
+	Remove extraneous change log
+
+2001-02-10	<rlk@sourceforge.net>
+
 	Files:	Makefile.am (1.89) (+5 -5)
 
 	Do 'make all' before doing any of the make install variants.
@@ -19511,28 +25978,44 @@
 
 	Files:	Makefile.am (1.88) (+5 -2)
 		acconfig.h (1.5) (+9 -1)
+		configure.in.in (1.6) (+107 -21)
+		lib/.cvsignore (1.4) (+4 -4)
+		po/ChangeLog (1.2) (+5 -0)
 		po/en_GB.po (1.2) (+202 -101)
+		po/en_TEST.po (1.2) (+208 -95)
+		src/include/gimp-print.h (1.5) (+15 -2)
 		src/main/Makefile.am (1.10) (+23 -2)
+		src/main/gimpprint-config.in (1.1) (added)
+		src/main/gimpprint.m4 (1.1) (added)
 		src/main/print-canon.c (1.7) (+26 -18)
+		src/main/print-dither.c (1.7) (+3 -3)
 		src/main/print-escp2.c (1.13) (+11 -11)
 		src/main/print-lexmark.c (1.13) (+13 -12)
 		src/main/print-pcl.c (1.7) (+4 -4)
 		src/main/print-util.c (1.7) (+5 -5)
-		src/main/print-version.c (1.1) ( )
+		src/main/print-version.c (1.1) (added)
 
 	Translated most of src/main
 	Added gimpprint.m4 and gimpprint-config
 	Added library versioning code to configure.in.in and src/main/Makefile.am
 	Added src/main/print-version.c for versioning variables
 
-2001-02-07	<rleigh@sourceforge.net>
+2001-02-08	<rleigh@sourceforge.net>
 
-	Files:	po/en_GB.po (1.1) ( )
+	Files:	configure.in.in (1.5) (+2 -2)
+		po/en_GB.po (1.1) (added)
+		po/en_TEST.po (1.1) (added)
 
 	Add en_GB and en_TEST translations
 
 2001-02-07	<rlk@sourceforge.net>
 
+	Files:	src/ghost/README (1.3) (+67 -62)
+
+	Update with latest modes
+
+2001-02-07	<rlk@sourceforge.net>
+
 	Files:	doc/FAQ.html (1.2) (+45 -13)
 
 	Updates
@@ -19557,34 +26040,42 @@
 
 2001-02-05	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.265.2.3) (+2 -2)
-		src/main/print-escp2.c (1.11) (+4 -4)
+	Files:	src/main/print-escp2.c (1.11) (+4 -4)
 
 	STP 2000P is 13" wide, not 8.5 (bug #131044)
 
-2001-02-04	<rlk@sourceforge.net>
+2001-02-05	<rlk@sourceforge.net>
 
-	Files:	print-util.c (1.150.2.2) (+2 -2)
+	Files:	Matgen/patched-print-dither.c (1.9) (removed)
 
-	Update the Epson roll paper size
+	Remove obsolete file
 
 2001-02-04	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.265.2.2) (+6 -6)
+	Files:	src/main/print-escp2.c (1.10) (+6 -6)
 
-	Support longer paper in newer printers
+	Fix up maximum page length for many printers.
 
-2001-02-04	<rlk@sourceforge.net>
+2001-02-04	<sharkey@sourceforge.net>
 
-	Files:	src/main/print-escp2.c (1.10) (+6 -6)
+	Files:	scripts/make-deb.sh (1.2) (+8 -6)
 
-	Fix up maximum page length for many printers.
+	Fix paths and targets for new dir structure and build methods.
+
+2001-02-04	<sharkey@sourceforge.net>
+
+	Files:	src/ghost/debian-patch (1.2) (+4 -6)
+
+	Changes needed for compatibility with Debian gs5.10-11.
 
 2001-02-03	<rleigh@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.15) (+4 -4)
+	Files:	lib/.cvsignore (1.3) (+5 -0)
+		lib/libprintut.h (1.2) (+8 -1)
+		src/cups/Makefile.am (1.15) (+4 -4)
 		src/escputil/Makefile.am (1.5) (+2 -2)
 		src/main/print-color.c (1.5) (+1 -5)
+		src/main/print-dither.c (1.6) (+1 -5)
 		src/main/print-escp2.c (1.9) (+1 -5)
 		src/main/print-util.c (1.6) (+1 -5)
 		src/main/print-weave.c (1.8) (+1 -5)
@@ -19609,6 +26100,7 @@
 2001-02-03	<rlk@sourceforge.net>
 
 	Files:	src/ghost/Makefile.am (1.5) (+7 -3)
+		src/main/gimp-print-internal.h (1.8) (+6 -2)
 
 	Let Ghostscript at least compile on a GNU system for now until we
 	fix up asprintf.
@@ -19622,7 +26114,10 @@
 2001-02-03	<rlk@sourceforge.net>
 
 	Files:	src/cups/rastertoprinter.c (1.7) (+14 -3)
+		src/ghost/gdevstp.c (1.2) (+12 -2)
 		src/gimp/print.c (1.3) (+14 -3)
+		src/include/gimp-print.h (1.4) (+24 -19)
+		src/main/gimp-print-internal.h (1.7) (+14 -6)
 		src/main/print-canon.c (1.6) (+58 -60)
 		src/main/print-escp2.c (1.8) (+102 -105)
 		src/main/print-lexmark.c (1.10) (+47 -51)
@@ -19634,15 +26129,36 @@
 	Convert direct printing to a file descriptor to print to an output
 	object passed in from the application.
 
+2001-02-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-dither.c (1.5) (+2 -2)
+
+	Advance the pointer correctly in grayscale mode when the source
+	resolution is better than the output resolution.
+
+2001-02-03	<rlk@sourceforge.net>
+
+	Files:	src/ghost/contrib.mak.addon (1.3) (+10 -10)
+		src/ghost/devs.mak.addon-5.10 (1.3) (+10 -10)
+
+	Turn off i18n for Ghostscript.
+
 2001-02-02	<rleigh@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.14) (+3 -3)
+	Files:	lib/.cvsignore (1.2) (+1 -0)
+		src/cups/Makefile.am (1.14) (+3 -3)
 		src/gimp/Makefile.am (1.8) (+4 -1)
 		test/Makefile.am (1.7) (+4 -4)
 
 	All executables that link with libgimpprint are linked with $(INTLLIBS),
 	except print, which has gettext provided by the GIMP
 
+2001-02-02	<rlk@sourceforge.net>
+
+	Files:	src/gimp/gimp_main_window.c (1.6) (+3 -3)
+
+	g_malloc, not g_xmalloc
+
 2001-02-02	<rleigh@sourceforge.net>
 
 	Files:	src/cups/rastertoprinter.c (1.6) (+3 -3)
@@ -19651,18 +26167,33 @@
 
 2001-02-02	<rleigh@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.13) (+4 -3)
+	Files:	configure.in.in (1.4) (+3 -2)
+		lib/Makefile.am (1.3) (+5 -12)
+		lib/libprintut.h (1.1) (added)
+		lib/xmalloc.c (1.2) (+31 -10)
+		lib/xmalloc.h (1.3) (+13 -3)
+		src/cups/Makefile.am (1.13) (+4 -3)
 		src/cups/genppd.c (1.7) (+60 -56)
 		src/cups/rastertoprinter.c (1.5) (+3 -3)
 		src/escputil/Makefile.am (1.4) (+2 -2)
 		src/escputil/escputil.c (1.2) (+6 -5)
 		src/gimp/Makefile.am (1.7) (+2 -2)
+		src/gimp/gimp_color_window.c (1.2) (+3 -2)
+		src/gimp/gimp_main_window.c (1.5) (+5 -4)
+		src/gimp/gtk_color_window.c (1.2) (+3 -1)
+		src/gimp/gtk_main_window.c (1.4) (+4 -2)
 		src/gimp/print-image-gimp.c (1.2) (+4 -3)
 		src/gimp/print.c (1.2) (+6 -5)
+		src/include/Makefile.am (1.6) (+2 -2)
+		src/include/gimp-print-intl.h (1.1) (added)
+		src/include/print-intl.h (1.2) (removed)
 		src/main/Makefile.am (1.9) (+2 -2)
+		src/main/gimp-print-internal.h (1.6) (+3 -3)
 		test/Makefile.am (1.6) (+2 -1)
+		test/escp2-unprint.c (1.2) (+7 -37)
 		test/escp2-weavetest.c (1.4) (+9 -8)
 		test/pcl-unprint.c (1.2) (+16 -15)
+		test/printer_options.c (1.4) (+2 -1)
 		test/testdither.c (1.4) (+3 -2)
 		test/unprint.c (1.2) (+8 -41)
 
@@ -19681,6 +26212,8 @@
 2001-02-01	<rlk@sourceforge.net>
 
 	Files:	AUTHORS (1.8) (+3 -0)
+		src/gimp/gimp_main_window.c (1.4) (+11 -32)
+		src/gimp/gtk_main_window.c (1.3) (+1 -60)
 
 	Remove last real vestiges of linear mode.
 
@@ -19688,20 +26221,23 @@
 
 2001-02-01	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.68.2.1) (+2 -2)
+	Files:	src/gimp/gimp_main_window.c (1.3) (+2 -2)
 
 	Set Image Scale now works correctly when image scaling was previously
-	in percent mode (from mainline)
+	in percent mode.
 
 2001-02-01	<rlk@sourceforge.net>
 
-	Files:	src/main/printers.xml (1.2) (+10 -0)
+	Files:	src/ghost/README (1.2) (+1 -0)
+		src/main/printers.xml (1.2) (+10 -0)
 
 	Add Compaq IJ750 as alias for Lexmark 3200
 
 2001-01-31	<stevek@sourceforge.net>
 
 	Files:	po/POTFILES.in (1.3) (+1 -1)
+		src/gimp/gimp_main_window.c (1.2) (+9 -2)
+		src/gimp/gtk_main_window.c (1.2) (+9 -2)
 		src/main/Makefile.am (1.7) (+2 -2)
 		src/main/print-escp2.c (1.7) (+18 -3)
 
@@ -19716,9 +26252,13 @@
 
 2001-01-31	<rleigh@sourceforge.net>
 
-	Files:	src/main/Makefile.am (1.6) (+2 -2)
+	Files:	lib/xmalloc.h (1.2) (+3 -5)
+		src/main/Makefile.am (1.6) (+2 -2)
+		src/main/gimp-print-internal.h (1.5) (+6 -2)
+		src/main/gimp-print-intl-internal.h (1.1) (added)
 		src/main/print-canon.c (1.5) (+11 -11)
 		src/main/print-color.c (1.4) (+6 -6)
+		src/main/print-dither.c (1.4) (+14 -14)
 		src/main/print-escp2.c (1.6) (+25 -25)
 		src/main/print-lexmark.c (1.9) (+11 -11)
 		src/main/print-pcl.c (1.5) (+17 -17)
@@ -19730,10 +26270,13 @@
 
 2001-01-31	<rleigh@sourceforge.net>
 
-	Files:	po/POTFILES.in (1.2) (+1 -0)
+	Files:	configure.in.in (1.3) (+7 -1)
+		lib/Makefile.am (1.2) (+13 -2)
+		po/POTFILES.in (1.2) (+1 -0)
 		src/main/Makefile.am (1.5) (+2 -1)
 		src/main/print-canon.c (1.4) (+58 -57)
 		src/main/print-color.c (1.3) (+2 -1)
+		src/main/print-dither.c (1.3) (+9 -8)
 		src/main/print-escp2.c (1.5) (+53 -52)
 		src/main/print-lexmark.c (1.8) (+58 -57)
 		src/main/print-pcl.c (1.4) (+54 -53)
@@ -19758,6 +26301,7 @@
 
 	Files:	NEWS (1.6) (+4 -1)
 		README (1.45) (+1 -1)
+		configure.in.in (1.2) (+2 -2)
 
 	Bump version.
 
@@ -19787,7 +26331,8 @@
 
 2001-01-29	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.3) (+1 -8)
+	Files:	src/main/gimp-print-internal.h (1.4) (+196 -2)
+		src/main/print-canon.c (1.3) (+1 -8)
 		src/main/print-escp2.c (1.4) (+38 -936)
 		src/main/print-lexmark.c (1.6) (+1 -7)
 		src/main/print-weave.c (1.3) (+774 -3)
@@ -19826,13 +26371,17 @@
 2001-01-26	<rleigh@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.11) (+17 -5)
+		src/include/Makefile.am (1.5) (+2 -2)
 
 	Install header in pkgincludedir
 	Remove empty installation directories
 
 2001-01-26	<rlk@sourceforge.net>
 
-	Files:	autogen.sh (1.2) (+1 -1)
+	Files:	ChangeLog (1.78) (removed)
+		autogen.sh (1.2) (+1 -1)
+		configure.in (1.59) (removed)
+		configure.in.in (1.1) (added)
 		scripts/autogen.sh (1.2) (+4 -0)
 
 	Generate change log purely on the fly (don't commit it at all).
@@ -19840,24 +26389,37 @@
 	Set date at autogen time, not configure time (so release date
 	means release date, not user build date).
 
+2001-01-26	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.58) (+2 -2)
+
+	Set cups_sysconfdir per Chris Kuklewicz
+
 2001-01-25	<rleigh@sourceforge.net>
 
-	Files:	man/Makefile.am (1.2) (+2 -2)
+	Files:	configure.in (1.57) (+20 -5)
+		man/Makefile.am (1.2) (+2 -2)
 		src/cups/Makefile.am (1.10) (+20 -13)
+		src/include/Makefile.am (1.4) (+4 -2)
 
 	Tidy up cups install, by using automake variables for automated
 	installation. This leaved just ppd file installation in install-data-local
 
 2001-01-25	<rleigh@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.9) (+9 -12)
+	Files:	configure.in (1.56) (+6 -2)
+		src/cups/Makefile.am (1.9) (+9 -12)
 
 	Clean up cups build and install
 
 2001-01-25	<rleigh@sourceforge.net>
 
-	Files:	src/escputil/Makefile.am (1.3) (+2 -1)
+	Files:	configure.in (1.55) (+2 -2)
+		debian/packages (1.2) (+1 -0)
+		src/escputil/Makefile.am (1.3) (+2 -1)
+		src/include/gimp-print.h (1.3) (+5 -5)
 		src/main/Makefile.am (1.4) (+3 -3)
+		src/main/gimp-print-internal.h (1.3) (+5 -9)
 
 	Restore VPATH build
 	Add Build-Depends to debian package
@@ -19870,6 +26432,15 @@
 
 2001-01-25	<rlk@sourceforge.net>
 
+	Files:	src/include/gimp-print.h (1.2) (+8 -182)
+		src/main/gimp-print-internal.h (1.2) (+191 -2)
+
+	Split internal things (dither, mostly) into gimp-print-internal.h.
+
+	C++-protect header files.
+
+2001-01-25	<rlk@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.3) (+26 -21)
 
 	Avoid a spurious seg fault if someone supplies a non-empty string to a
@@ -19912,8 +26483,10 @@
 
 2001-01-24	<rlk@sourceforge.net>
 
-	Files:	src/cups/Makefile.am (1.6) (+3 -3)
-		src/cups/cups-calibrate.c (1.1) ( )
+	Files:	configure.in (1.54) (+2 -2)
+		src/cups/Makefile.am (1.6) (+3 -3)
+		src/cups/cups-calibrate.c (1.1) (added)
+		src/cups/cups_calibrate.c (1.2) (removed)
 
 	Rename cups_calibrate to cups-calibrate.
 
@@ -19925,13 +26498,16 @@
 
 2001-01-24	<rlk@sourceforge.net>
 
-	Files:	NEWS (1.4) (+7 -1)
+	Files:	ChangeLog (1.77) (+19 -0)
+		NEWS (1.4) (+7 -1)
 		README (1.43) (+32 -6)
 		acconfig.h (1.4) (+4 -1)
+		configure.in (1.53) (+3 -6)
 		src/cups/README (1.2) (+1 -29)
 		src/escputil/Makefile.am (1.2) (+2 -3)
 		src/gimp/Makefile.am (1.4) (+2 -3)
 		src/main/Makefile.am (1.3) (+2 -3)
+		src/printdef/Makefile.am (1.2) (+2 -3)
 		test/Makefile.am (1.2) (+2 -3)
 
 	Update README's
@@ -19947,6 +26523,12 @@
 
 2001-01-24	<rlk@sourceforge.net>
 
+	Files:	ChangeLog (1.76) (+83 -0)
+
+	Update the change log
+
+2001-01-24	<rlk@sourceforge.net>
+
 	Files:	AUTHORS (1.7) (+23 -13)
 
 	Update the list of authors.
@@ -19954,9 +26536,14 @@
 2001-01-24	<rlk@sourceforge.net>
 
 	Files:	acconfig.h (1.3) (+3 -1)
+		configure.in (1.52) (+19 -7)
 		src/cups/Makefile.am (1.3) (+13 -13)
+		src/cups/calibrate.c (1.2) (removed)
+		src/cups/cups_calibrate.c (1.1) (added)
 		src/cups/genppd.c (1.5) (+3 -2)
 		src/ghost/Makefile.am (1.4) (+7 -3)
+		src/ghost/contrib.mak.addon (1.2) (+9 -9)
+		src/ghost/devs.mak.addon-5.10 (1.2) (+9 -9)
 
 	1) Set HAVE_LIBZ correctly, so genppd compresses them (CUPS seems to
 	   get surprisingly unhappy if it finds uncompressed .ppd files).
@@ -19985,6 +26572,13 @@
 
 2001-01-23	<rleigh@sourceforge.net>
 
+	Files:	ChangeLog (1.75) (+112 -39)
+		configure.in (1.51) (+3 -2)
+
+	Enable build when a prefix is specifed to --with-cups
+
+2001-01-23	<rleigh@sourceforge.net>
+
 	Files:	src/gimp/Makefile.am (1.3) (+5 -5)
 
 	Fix gimp install
@@ -19992,27 +26586,37 @@
 2001-01-23	<rleigh@sourceforge.net>
 
 	Files:	.cvsignore (1.12) (+3 -0)
-		man/.cvsignore (1.1) ( )
-		po/.cvsignore (1.1) ( )
-		scripts/.cvsignore (1.1) ( )
-		src/.cvsignore (1.1) ( )
-		src/cups/.cvsignore (1.1) ( )
+		configure.in (1.50) (+4 -4)
+		lib/.cvsignore (1.1) (added)
+		man/.cvsignore (1.1) (added)
+		po/.cvsignore (1.1) (added)
+		scripts/.cvsignore (1.1) (added)
+		src/.cvsignore (1.1) (added)
+		src/cups/.cvsignore (1.1) (added)
 		src/cups/.cvsignore (1.2) (+9 -0)
-		src/escputil/.cvsignore (1.1) ( )
-		src/ghost/.cvsignore (1.1) ( )
+		src/escputil/.cvsignore (1.1) (added)
+		src/ghost/.cvsignore (1.1) (added)
 		src/ghost/.cvsignore (1.2) (+14 -0)
-		src/gimp/.cvsignore (1.1) ( )
-		src/main/.cvsignore (1.1) ( )
-		test/.cvsignore (1.1) ( )
+		src/gimp/.cvsignore (1.1) (added)
+		src/include/.cvsignore (1.1) (added)
+		src/main/.cvsignore (1.1) (added)
+		src/printdef/.cvsignore (1.1) (added)
+		test/.cvsignore (1.1) (added)
 
 	Added .cvsignore
 
 2001-01-23	<rleigh@sourceforge.net>
 
 	Files:	.cvsignore (1.11) (+4 -16)
+		configure.in (1.49) (+2 -1)
 		src/cups/Makefile.am (1.2) (+4 -3)
 		src/gimp/Makefile.am (1.2) (+5 -2)
+		src/include/Makefile.am (1.3) (+2 -2)
+		src/include/gimp-print-internal.h (1.2) (removed)
 		src/main/Makefile.am (1.2) (+2 -1)
+		src/main/gimp-print-internal.h (1.1) (added)
+		src/printdef/printdef.h (1.3) (+1 -2)
+		test/printer_options.c (1.3) (+1 -2)
 		test/testdither.c (1.3) (+2 -3)
 
 	Fix cups install, libgimpprint headers
@@ -20032,23 +26636,32 @@
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	src/ghost/Makefile.am (1.3) (+2 -2)
+	Files:	configure.in (1.48) (+2 -2)
+		src/ghost/Makefile.am (1.3) (+2 -2)
 
 	Fix ghost header and build all test programs except testdither
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.3) (+4 -3)
+	Files:	Matgen/patched-print-dither.c (1.8) (+3 -2)
+		src/cups/genppd.c (1.3) (+4 -3)
 		src/cups/rastertoprinter.c (1.3) (+4 -3)
 		src/gimp/print_gimp.h (1.2) (+3 -2)
+		src/include/Makefile.am (1.2) (+3 -3)
+		src/include/gimp-print-internal.h (1.1) (added)
+		src/include/gimp-print.h (1.1) (added)
+		src/include/print.h (1.2) (removed)
 		src/main/print-canon.c (1.2) (+3 -2)
 		src/main/print-color.c (1.2) (+3 -2)
+		src/main/print-dither.c (1.2) (+3 -2)
 		src/main/print-escp2.c (1.2) (+3 -2)
 		src/main/print-lexmark.c (1.2) (+3 -2)
 		src/main/print-pcl.c (1.2) (+3 -2)
 		src/main/print-ps.c (1.2) (+3 -2)
 		src/main/print-util.c (1.2) (+3 -2)
 		src/main/print-weave.c (1.2) (+3 -2)
+		src/printdef/printdef.h (1.2) (+3 -2)
+		test/printer_options.c (1.2) (+3 -2)
 		test/testdither.c (1.2) (+4 -3)
 
 	Split print.h into gimp-print.h and gimp-print-internal.h
@@ -20061,6 +26674,19 @@
 
 2001-01-22	<rleigh@sourceforge.net>
 
+	Files:	ChangeLog (1.74) (+303 -0)
+		configure.in (1.47) (+2 -2)
+
+	Fix version number
+
+2001-01-22	<rleigh@sourceforge.net>
+
+	Files:	gimp.m4 (1.2) (removed)
+
+	Remove gimp.m4 (now in scripts)
+
+2001-01-22	<rleigh@sourceforge.net>
+
 	Files:	src/cups/genppd.c (1.2) (+3 -3)
 		src/cups/rastertoprinter.c (1.2) (+3 -3)
 
@@ -20068,149 +26694,302 @@
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	po/POTFILES.in (1.1) ( )
+	Files:	Ghost/COPYING (1.2) (removed)
+		Ghost/ChangeLog (1.2) (removed)
+		Ghost/Makefile (1.2) (removed)
+		Ghost/README (1.65) (removed)
+		Ghost/README.bsd (1.2) (removed)
+		Ghost/contrib.mak.addon (1.14) (removed)
+		Ghost/debian-patch (1.4) (removed)
+		Ghost/debian-patch-stp (1.2) (removed)
+		Ghost/devs.mak.addon-5.10 (1.8) (removed)
+		Ghost/gdevstp.c (1.52) (removed)
+		po/POTFILES.in (1.1) (added)
+		src/ghost/COPYING (1.1) (added)
+		src/ghost/ChangeLog (1.1) (added)
 		src/ghost/Makefile.am (1.2) (+1 -3)
+		src/ghost/README (1.1) (added)
+		src/ghost/README.bsd (1.1) (added)
+		src/ghost/contrib.mak.addon (1.1) (added)
+		src/ghost/debian-patch (1.1) (added)
+		src/ghost/debian-patch-stp (1.1) (added)
+		src/ghost/devs.mak.addon-5.10 (1.1) (added)
+		src/ghost/gdevstp.c (1.1) (added)
 
 	Moved ghostscript files under src/ghost. Added po/POTFILES.in
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	src/cups/COPYING (1.1) ( )
-		src/cups/README (1.1) ( )
-		src/cups/calibrate.ppm (1.1) ( )
-		src/cups/canon.c (1.1) ( )
-		src/cups/command.txt (1.1) ( )
-		src/cups/command.types (1.1) ( )
-		src/cups/commands/CleanAll.cmd (1.1) ( )
-		src/cups/commands/PrintAligmentPage.cmd (1.1) ( )
-		src/cups/commands/PrintSelfTestPage.cmd (1.1) ( )
-		src/cups/commands/ReportLevels.cmd (1.1) ( )
-		src/cups/commands/SetAlignment.cmd (1.1) ( )
-		src/cups/commandtocanon.c (1.1) ( )
-		src/cups/commandtoepson.c (1.1) ( )
-		src/cups/epson.c (1.1) ( )
-		src/cups/genppd.c (1.1) ( )
-		src/cups/rastertoprinter.c (1.1) ( )
+	Files:	cups/CHANGES.txt (1.2) (removed)
+		cups/LICENSE.txt (1.3) (removed)
+		cups/Makefile.in (1.23) (removed)
+		cups/README.txt (1.9) (removed)
+		cups/calibrate.c (1.8) (removed)
+		cups/calibrate.ppm (1.2) (removed)
+		cups/canon.c (1.2) (removed)
+		cups/command.txt (1.3) (removed)
+		cups/command.types (1.3) (removed)
+		cups/commands/CleanAll.cmd (1.2) (removed)
+		cups/commands/PrintAligmentPage.cmd (1.2) (removed)
+		cups/commands/PrintSelfTestPage.cmd (1.2) (removed)
+		cups/commands/ReportLevels.cmd (1.2) (removed)
+		cups/commands/SetAlignment.cmd (1.2) (removed)
+		cups/commandtocanon.c (1.2) (removed)
+		cups/commandtoepson.c (1.8) (removed)
+		cups/configure (1.8) (removed)
+		cups/configure.in (1.9) (removed)
+		cups/epson.c (1.8) (removed)
+		cups/genppd.c (1.23) (removed)
+		cups/rastertoprinter.c (1.17) (removed)
+		src/cups/COPYING (1.1) (added)
+		src/cups/ChangeLog (1.1) (added)
+		src/cups/README (1.1) (added)
+		src/cups/calibrate.c (1.1) (added)
+		src/cups/calibrate.ppm (1.1) (added)
+		src/cups/canon.c (1.1) (added)
+		src/cups/command.txt (1.1) (added)
+		src/cups/command.types (1.1) (added)
+		src/cups/commands/CleanAll.cmd (1.1) (added)
+		src/cups/commands/PrintAligmentPage.cmd (1.1) (added)
+		src/cups/commands/PrintSelfTestPage.cmd (1.1) (added)
+		src/cups/commands/ReportLevels.cmd (1.1) (added)
+		src/cups/commands/SetAlignment.cmd (1.1) (added)
+		src/cups/commandtocanon.c (1.1) (added)
+		src/cups/commandtoepson.c (1.1) (added)
+		src/cups/epson.c (1.1) (added)
+		src/cups/genppd.c (1.1) (added)
+		src/cups/rastertoprinter.c (1.1) (added)
 
 	Moved cups/* under src/cups
 
 2001-01-22	<rleigh@sourceforge.net>
 
 	Files:	COPYING (1.3) (+1 -60)
+		Documentation/docbook.css (1.2) (removed)
+		Documentation/print-color.png (1.2) (removed)
+		Documentation/print-main.png (1.2) (removed)
+		Documentation/print-setup.png (1.2) (removed)
+		Documentation/print.html (1.3) (removed)
+		Documentation/print.sgml (1.2) (removed)
+		FAQ.html (1.4) (removed)
+		INSTALL (1.7) (removed)
+		LICENSE (1.2) (removed)
 		NEWS (1.3) (+74 -62)
-		doc/FAQ.html (1.1) ( )
+		README.dither (1.10) (removed)
+		README.escp2 (1.14) (removed)
+		README.new-printer (1.5) (removed)
+		README.weave (1.3) (removed)
+		RELNOTES (1.39) (removed)
+		doc/FAQ.html (1.1) (added)
+		doc/README.dither (1.1) (added)
+		doc/README.escp2 (1.1) (added)
+		doc/README.new-printer (1.1) (added)
+		doc/README.weave (1.1) (added)
+		doc/docbook.css (1.1) (added)
+		doc/print-color.png (1.1) (added)
+		doc/print-main.png (1.1) (added)
+		doc/print-setup.png (1.1) (added)
+		doc/print.html (1.1) (added)
+		doc/print.sgml (1.1) (added)
 
 	Moved documentation
 
 2001-01-22	<rleigh@sourceforge.net>
 
 	Files:	acconfig.h (1.2) (+3 -0)
-		scripts/autogen.sh (1.1) ( )
-		scripts/mkchlog (1.1) ( )
+		make-deb.sh (1.5) (removed)
+		mkchlog (1.5) (removed)
+		scripts/autogen.sh (1.1) (added)
+		scripts/gettext.m4 (1.1) (added)
+		scripts/gimp.m4 (1.1) (added)
+		scripts/lcmessage.m4 (1.1) (added)
+		scripts/libtool.m4 (1.1) (added)
+		scripts/make-deb.sh (1.1) (added)
+		scripts/mkchlog (1.1) (added)
+		scripts/progtest.m4 (1.1) (added)
 
 	Move scripts under scripts. Add m4 macros (may be outdated)
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	print.h (1.106) (+2 -2)
+	Files:	install-sh (1.2) (removed)
+		missing (1.2) (removed)
+		mkinstalldirs (1.4) (removed)
+
+	Removed old autoconf/make scripts. Now generated automatically.
+
+2001-01-22	<rleigh@sourceforge.net>
+
+	Files:	print.h (1.106) (removed)
+		src/include/print-intl.h (1.1) (added)
+		src/include/print.h (1.1) (added)
 
 	Moved headers under src/include
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	printdef.h (1.6) (+1 -1)
-		printdefl.l (1.6) (+1 -1)
-		printdefy.y (1.19) (+1 -1)
+	Files:	printdef.h (1.6) (removed)
+		printdefl.l (1.6) (removed)
+		printdefy.y (1.19) (removed)
+		src/printdef/printdef.h (1.1) (added)
+		src/printdef/printdefl.l (1.1) (added)
+		src/printdef/printdefy.y (1.1) (added)
 
 	Moved printdef sources under src/printdef
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	print-canon.c (1.114) (+1 -1)
-		print-color.c (1.12) (+1 -1)
-		print-dither.c (1.119) (+1 -1)
-		print-escp2.c (1.306) (+1 -1)
-		print-lexmark.c (1.22) (+1 -1)
-		print-pcl.c (1.113) (+1 -1)
-		print-ps.c (1.56) (+1 -1)
-		print-util.c (1.162) (+1 -1)
-		print-weave.c (1.12) (+1 -1)
-		quickmatrix257.h (1.5) (+1 -1)
-		ran.367.179.h (1.4) (+1 -1)
-		ran.509.131.h (1.4) (+1 -1)
-		src/main/print-canon.c (1.1) ( )
-		src/main/print-color.c (1.1) ( )
-		src/main/print-escp2.c (1.1) ( )
-		src/main/print-lexmark.c (1.1) ( )
-		src/main/print-pcl.c (1.1) ( )
-		src/main/print-ps.c (1.1) ( )
-		src/main/print-util.c (1.1) ( )
-		src/main/print-weave.c (1.1) ( )
-		src/main/printers.xml (1.1) ( )
+	Files:	print-canon.c (1.114) (removed)
+		print-color.c (1.12) (removed)
+		print-dither.c (1.119) (removed)
+		print-escp2.c (1.306) (removed)
+		print-lexmark.c (1.22) (removed)
+		print-pcl.c (1.113) (removed)
+		print-ps.c (1.56) (removed)
+		print-util.c (1.162) (removed)
+		print-weave.c (1.12) (removed)
+		printers.xml (1.49) (removed)
+		quickmatrix257.h (1.5) (removed)
+		ran.367.179.h (1.4) (removed)
+		ran.509.131.h (1.4) (removed)
+		src/main/print-canon.c (1.1) (added)
+		src/main/print-color.c (1.1) (added)
+		src/main/print-dither.c (1.1) (added)
+		src/main/print-escp2.c (1.1) (added)
+		src/main/print-lexmark.c (1.1) (added)
+		src/main/print-pcl.c (1.1) (added)
+		src/main/print-ps.c (1.1) (added)
+		src/main/print-util.c (1.1) (added)
+		src/main/print-weave.c (1.1) (added)
+		src/main/printers.xml (1.1) (added)
+		src/main/quickmatrix257.h (1.1) (added)
+		src/main/ran.367.179.h (1.1) (added)
+		src/main/ran.509.131.h (1.1) (added)
 
 	Moved libgimpprint sources under src/main
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	escp2-unprint.c (1.6) (+1 -1)
-		escp2-weavetest.c (1.19) (+1 -1)
-		pcl-unprint.c (1.19) (+2 -2)
-		printer_options.c (1.8) (+1 -1)
-		test/cyan-sweep.tif (1.1) ( )
-		test/escp2-weavetest.c (1.1) ( )
-		test/parse-escp2 (1.1) ( )
-		test/pcl-unprint.c (1.1) ( )
-		test/run-weavetest (1.1) ( )
-		test/testdither.c (1.1) ( )
-		test/unprint.c (1.1) ( )
-		testdither.c (1.6) (+2 -2)
-		unprint.c (1.45) (+1 -1)
+	Files:	cyan-sweep.tif (1.2) (removed)
+		escp2-unprint.c (1.6) (removed)
+		escp2-weavetest.c (1.19) (removed)
+		parse-escp2 (1.4) (removed)
+		pcl-unprint.c (1.19) (removed)
+		printer_options.c (1.8) (removed)
+		run-weavetest (1.20) (removed)
+		test/cyan-sweep.tif (1.1) (added)
+		test/escp2-unprint.c (1.1) (added)
+		test/escp2-weavetest.c (1.1) (added)
+		test/parse-escp2 (1.1) (added)
+		test/pcl-unprint.c (1.1) (added)
+		test/printer_options.c (1.1) (added)
+		test/run-weavetest (1.1) (added)
+		test/testdither.c (1.1) (added)
+		test/unprint.c (1.1) (added)
+		testdither.c (1.6) (removed)
+		unprint.c (1.45) (removed)
 
 	Moved test programs under test
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	escputil.c (1.27) (+1 -1)
-		man/escputil.1.in (1.1) ( )
-		src/escputil/escputil.c (1.1) ( )
+	Files:	escputil.1.in (1.2) (removed)
+		escputil.c (1.27) (removed)
+		man/escputil.1.in (1.1) (added)
+		src/escputil/escputil.c (1.1) (added)
 
 	Moved escputil to src/escputil and man
 
 2001-01-22	<rleigh@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.25) (+1 -1)
-		gimp_main_window.c (1.80) (+1 -1)
-		gtk_color_window.c (1.26) (+1 -1)
-		gtk_main_window.c (1.64) (+1 -1)
-		print-image-gimp.c (1.11) (+2 -2)
-		print-intl.h (1.2) (+1 -1)
-		print.c (1.137) (+2 -2)
-		print_gimp.h (1.31) (+1 -1)
-		src/gimp/print-image-gimp.c (1.1) ( )
-		src/gimp/print-intl.h (1.1) ( )
-		src/gimp/print.c (1.1) ( )
-		src/gimp/print_gimp.h (1.1) ( )
+	Files:	gimp_color_window.c (1.25) (removed)
+		gimp_main_window.c (1.80) (removed)
+		gtk_color_window.c (1.26) (removed)
+		gtk_main_window.c (1.64) (removed)
+		print-image-gimp.c (1.11) (removed)
+		print-intl.h (1.2) (removed)
+		print.c (1.137) (removed)
+		print_gimp.h (1.31) (removed)
+		src/gimp/gimp_color_window.c (1.1) (added)
+		src/gimp/gimp_main_window.c (1.1) (added)
+		src/gimp/gtk_color_window.c (1.1) (added)
+		src/gimp/gtk_main_window.c (1.1) (added)
+		src/gimp/print-image-gimp.c (1.1) (added)
+		src/gimp/print-intl.h (1.1) (added)
+		src/gimp/print.c (1.1) (added)
+		src/gimp/print_gimp.h (1.1) (added)
 
 	Moved gimp-print plugin under src/gimp
 
 2001-01-22	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.84) (+63 -226)
-		autogen.sh (1.1) ( )
-		man/Makefile.am (1.1) ( )
-		src/Makefile.am (1.1) ( )
-		src/cups/Makefile.am (1.1) ( )
-		src/escputil/Makefile.am (1.1) ( )
-		src/ghost/Makefile.am (1.1) ( )
-		src/gimp/Makefile.am (1.1) ( )
-		src/main/Makefile.am (1.1) ( )
-		test/Makefile.am (1.1) ( )
+		autogen.sh (1.1) (added)
+		configure.in (1.46) (+312 -77)
+		lib/Makefile.am (1.1) (added)
+		lib/alloca.c (1.1) (added)
+		lib/getopt.c (1.1) (added)
+		lib/getopt.h (1.1) (added)
+		lib/getopt1.c (1.1) (added)
+		lib/pathmax.h (1.1) (added)
+		lib/strcspn.c (1.1) (added)
+		lib/vasprintf.c (1.1) (added)
+		lib/xgetcwd.c (1.1) (added)
+		lib/xmalloc.c (1.1) (added)
+		lib/xmalloc.h (1.1) (added)
+		man/Makefile.am (1.1) (added)
+		po/ChangeLog (1.1) (added)
+		src/Makefile.am (1.1) (added)
+		src/cups/Makefile.am (1.1) (added)
+		src/escputil/Makefile.am (1.1) (added)
+		src/ghost/Makefile.am (1.1) (added)
+		src/gimp/Makefile.am (1.1) (added)
+		src/include/Makefile.am (1.1) (added)
+		src/main/Makefile.am (1.1) (added)
+		src/printdef/Makefile.am (1.1) (added)
+		test/Makefile.am (1.1) (added)
 
 	Added build scripts and new directories
 
+2001-01-22	<easysw@sourceforge.net>
+
+	Files:	makesrcdist (1.1) (added)
+
+	file makesrcdist was initially added on branch print-4_0_branch.
+
+2001-01-22	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.13) (+10 -10)
+
+	Get the print.h dependency right.
+
+2001-01-21	<rlk@sourceforge.net>
+
+	Files:	Ghost/com-stp.ppd (1.4) (removed)
+		Ghost/gs-stp.pdq (1.8) (removed)
+
+	Remove obsolete files that will not work any longer
+
+2001-01-21	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.73) (+57 -0)
+
+	4.1.2 release
+
+2001-01-21	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.38) (+34 -0)
+
+	Prep for 4.1.2.
+
 2001-01-20	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.79) (+41 -32)
+	Files:	Ghost/contrib.mak.addon (1.12) (+11 -11)
+		Ghost/devs.mak.addon-5.10 (1.7) (+11 -11)
+		Ghost/gdevstp.c (1.51) (+5 -5)
+		cups/genppd.c (1.22) (+13 -13)
+		cups/rastertoprinter.c (1.16) (+5 -4)
+		gimp_main_window.c (1.79) (+41 -32)
 		gtk_main_window.c (1.63) (+24 -15)
 		print-canon.c (1.113) (+29 -18)
 		print-escp2.c (1.305) (+20 -9)
@@ -20222,6 +27001,7 @@
 		print.h (1.105) (+15 -91)
 		printdefy.y (1.18) (+27 -76)
 		printer_options.c (1.7) (+2 -2)
+		printers.xml (1.48) (+3 -3)
 
 	Create printfuncs_t that encapsulates all of the printer-specific
 	functions.
@@ -20240,7 +27020,17 @@
 
 2001-01-20	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.24) (+11 -5)
+	Files:	Ghost/README (1.64) (+2 -0)
+		printers.xml (1.47) (+21 -5)
+
+	More Canon stuff
+
+2001-01-20	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.72) (+75 -0)
+		Matgen/patched-print-dither.c (1.7) (+2 -2)
+		cups/genppd.c (1.21) (+6 -6)
+		gimp_color_window.c (1.24) (+11 -5)
 		gimp_main_window.c (1.77) (+3 -3)
 		gtk_color_window.c (1.25) (+10 -10)
 		print-dither.c (1.118) (+39 -26)
@@ -20257,7 +27047,11 @@
 
 2001-01-20	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.111) (+12 -12)
+	Files:	Ghost/README (1.63) (+2 -0)
+		Ghost/gdevstp.c (1.50) (+70 -35)
+		cups/genppd.c (1.20) (+2 -22)
+		cups/rastertoprinter.c (1.15) (+70 -35)
+		print-canon.c (1.111) (+12 -12)
 		print-escp2.c (1.304) (+13 -13)
 		print-image-gimp.c (1.10) (+90 -48)
 		print-lexmark.c (1.20) (+14 -14)
@@ -20268,6 +27062,7 @@
 		print.h (1.103) (+69 -71)
 		print_gimp.h (1.30) (+9 -2)
 		printer_options.c (1.6) (+1 -93)
+		printers.xml (1.46) (+16 -0)
 
 	Convert Image to true polymorphic stp_image_t.
 
@@ -20275,7 +27070,12 @@
 
 2001-01-19	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.23) (+5 -5)
+	Files:	ChangeLog (1.71) (+30 -0)
+		Ghost/gdevstp.c (1.49) (+9 -9)
+		Matgen/patched-print-dither.c (1.6) (+49 -49)
+		cups/genppd.c (1.19) (+4 -4)
+		cups/rastertoprinter.c (1.14) (+6 -6)
+		gimp_color_window.c (1.23) (+5 -5)
 		gimp_main_window.c (1.76) (+17 -17)
 		gtk_color_window.c (1.24) (+4 -4)
 		gtk_main_window.c (1.62) (+7 -7)
@@ -20304,13 +27104,24 @@
 
 2001-01-16	<rlk@sourceforge.net>
 
+	Files:	cups/genppd.c (1.18) (+4 -15)
+
+	Make the printer list static.
+
+2001-01-16	<rlk@sourceforge.net>
+
 	Files:	printdefy.y (1.15) (+2 -2)
 
 	Make the printer list static to print-util.c.
 
 2001-01-15	<rlk@sourceforge.net>
 
-	Files:	escp2-weavetest.c (1.18) (+2 -2)
+	Files:	ChangeLog (1.70) (+101 -0)
+		Ghost/gdevstp.c (1.48) (+9 -9)
+		Matgen/patched-print-dither.c (1.5) (+13 -13)
+		cups/genppd.c (1.17) (+7 -7)
+		cups/rastertoprinter.c (1.13) (+5 -5)
+		escp2-weavetest.c (1.18) (+2 -2)
 		escputil.c (1.26) (+5 -5)
 		gimp_color_window.c (1.22) (+7 -7)
 		gimp_main_window.c (1.75) (+15 -15)
@@ -20335,6 +27146,12 @@
 
 2001-01-15	<rlk@sourceforge.net>
 
+	Files:	FAQ.html (1.3) (+34 -11)
+
+	Fix the HTML.
+
+2001-01-15	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.301) (+4 -4)
 
 	One more 7 color fix
@@ -20347,11 +27164,19 @@
 
 	Free dark yellow if it exists.
 
-2001-01-08	<easysw@sourceforge.net>
+2001-01-10	<sharkey@sourceforge.net>
+
+	Files:	Ghost/debian-patch (1.3) (+6 -5)
+
+	Adjust patch to apply cleanly to new gs5.10-10.1 sources from Debian.
+
+	Change my email address to sharkey@debian.org in the changelog.
 
-	Files:	print-escp2.c (1.265.2.1) (+12 -2)
+2001-01-10	<sharkey@sourceforge.net>
 
-	Stylus Color 680/777 support in 4.0.x tree.
+	Files:	make-deb.sh (1.4) (+1 -1)
+
+	Treat testing/unstable the same as woody.
 
 2001-01-07	<rlk@sourceforge.net>
 
@@ -20373,26 +27198,50 @@
 
 2001-01-06	<rleigh@sourceforge.net>
 
-	Files:	acconfig.h (1.1) ( )
+	Files:	config.h.in (1.2) (removed)
+
+	Removed config.h.in now acconfig.h is available.
+
+2001-01-06	<rleigh@sourceforge.net>
+
+	Files:	acconfig.h (1.1) (added)
 
 	Add acconfig.h to generate config.h.in with autoheader
 
 2001-01-05	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.25) (+3 -3)
+	Files:	config.h.in (1.1) (added)
+		configure.in (1.45) (+3 -1)
+		escputil.c (1.25) (+3 -3)
 
 	Emergency fix to configure to allow config.h to be created.
 
 2001-01-05	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.24) (+3 -1)
+	Files:	Ghost/README (1.62) (+1 -0)
+		escputil.c (1.24) (+3 -1)
 		print-escp2.c (1.299) (+15 -2)
+		printers.xml (1.45) (+10 -1)
 
 	Add Stylus Photo 890
 
 2001-01-04	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.298) (+14 -1)
+	Files:	Ghost/README (1.61) (+2 -0)
+
+	Lexmark 3200 and Epson Stylus Photo 1290
+
+2001-01-04	<rlk@sourceforge.net>
+
+	Files:	printers.xml (1.44) (+10 -10)
+
+	Put Lexmark printers in numerical order
+
+2001-01-04	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.69) (+132 -0)
+		print-escp2.c (1.298) (+14 -1)
+		printers.xml (1.43) (+9 -0)
 
 	Support the Stylus Photo 1290
 
@@ -20412,6 +27261,7 @@
 2001-01-03	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.81) (+4 -4)
+		configure.in (1.44) (+41 -9)
 		escp2-unprint.c (1.5) (+4 -1)
 		escp2-weavetest.c (1.17) (+4 -1)
 		escputil.c (1.23) (+4 -1)
@@ -20438,6 +27288,12 @@
 	Added global header (config.h) support
 	Added support for gimp plugin install in home directories
 
+2001-01-03	<rwisi@sourceforge.net>
+
+	Files:	printers.xml (1.42) (+14 -2)
+
+	Added support for Lexmark 3200.
+
 2001-01-02	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.296) (+3 -3)
@@ -20453,7 +27309,12 @@
 
 2001-01-01	<rlk@sourceforge.net>
 
-	Files:	README (1.40) (+3 -1)
+	Files:	Ghost/README (1.60) (+5 -0)
+		Ghost/gdevstp.c (1.47) (+6 -6)
+		README (1.40) (+3 -1)
+		RELNOTES (1.37) (+2 -6)
+		configure.in (1.43) (+1 -1)
+		cups/genppd.c (1.16) (+19 -19)
 		escp2-unprint.c (1.4) (+15 -15)
 		gimp_main_window.c (1.72) (+161 -14)
 		pcl-unprint.c (1.17) (+21 -21)
@@ -20512,7 +27373,14 @@
 
 2000-12-24	<rlk@sourceforge.net>
 
+	Files:	ChangeLog (1.68) (+64 -0)
+
+	4.1.1
+
+2000-12-24	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.292) (+210 -143)
+		printers.xml (1.41) (+0 -8)
 
 	Tune (somewhat) the 870/1270.
 
@@ -20520,7 +27388,9 @@
 
 2000-12-24	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.105) (+1 -2)
+	Files:	Ghost/gdevstp.c (1.46) (+1 -2)
+		cups/rastertoprinter.c (1.12) (+3 -3)
+		print-canon.c (1.105) (+1 -2)
 		print-color.c (1.7) (+2 -2)
 		print-dither.c (1.113) (+8 -3)
 		print-escp2.c (1.291) (+19 -20)
@@ -20529,6 +27399,7 @@
 		print-ps.c (1.48) (+1 -2)
 		print.c (1.130) (+3 -3)
 		print.h (1.98) (+135 -9)
+		printers.xml (1.40) (+0 -56)
 
 	More color tweaking for Epson printers.
 
@@ -20545,7 +27416,11 @@
 
 2000-12-23	<rlk@sourceforge.net>
 
-	Files:	README (1.39) (+1 -1)
+	Files:	ChangeLog (1.67) (+48 -0)
+		Ghost/README (1.59) (+9 -9)
+		README (1.39) (+1 -1)
+		RELNOTES (1.36) (+16 -1)
+		configure.in (1.42) (+1 -2)
 		print-escp2.c (1.290) (+29 -29)
 		print-lexmark.c (1.12) (+29 -29)
 		print-pcl.c (1.104) (+29 -29)
@@ -20561,6 +27436,7 @@
 2000-12-22	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.79) (+2 -0)
+		configure.in (1.41) (+14 -0)
 		escputil.c (1.20) (+101 -27)
 
 	Added GNU readline support to escputil
@@ -20573,7 +27449,8 @@
 
 2000-12-22	<rlk@sourceforge.net>
 
-	Files:	print-color.c (1.6) (+3 -1)
+	Files:	ChangeLog (1.66) (+6 -0)
+		print-color.c (1.6) (+3 -1)
 		print-escp2.c (1.288) (+41 -41)
 		print-lexmark.c (1.11) (+73 -72)
 		print-pcl.c (1.103) (+73 -72)
@@ -20595,6 +27472,18 @@
 
 2000-12-21	<rlk@sourceforge.net>
 
+	Files:	printers.xml (1.39) (+1 -1)
+
+	Fix Canon S450 entry
+
+2000-12-21	<rlk@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.22) (+3 -3)
+
+	Fix dependencies
+
+2000-12-21	<rlk@sourceforge.net>
+
 	Files:	print-dither.c (1.111) (+45 -55)
 
 	Try to attack some overflow problems.
@@ -20607,12 +27496,32 @@
 
 2000-12-18	<rlk@sourceforge.net>
 
-	Files:	README (1.38) (+0 -6)
+	Files:	ChangeLog (1.65) (+57 -0)
+
+	4.1.0 release
+
+2000-12-18	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.40) (+9 -1)
+
+	Enable --enable-gimptest=no
+
+2000-12-18	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.58) (+46 -32)
+		README (1.38) (+0 -6)
+		RELNOTES (1.35) (+45 -1)
 
 	Prep for 4.1.0 release
 
 2000-12-18	<rlk@sourceforge.net>
 
+	Files:	cups/genppd.c (1.15) (+4 -4)
+
+	strlen(x) + 1 != strlen(x + 1)
+
+2000-12-18	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.285) (+2 -1)
 
 	Add 720 micoweave unidirectional
@@ -20626,6 +27535,7 @@
 2000-12-17	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.283) (+109 -71)
+		printers.xml (1.38) (+8 -0)
 
 	Prepare Epson driver for future 7 color printer(s).
 
@@ -20633,7 +27543,8 @@
 
 2000-12-17	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.110) (+18 -18)
+	Files:	ChangeLog (1.64) (+7 -0)
+		print-dither.c (1.110) (+18 -18)
 		print-escp2.c (1.282) (+361 -518)
 
 	Generate dither matrices more correctly.
@@ -20648,7 +27559,8 @@
 
 2000-12-16	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.108) (+77 -115)
+	Files:	ChangeLog (1.63) (+26 -0)
+		print-dither.c (1.108) (+77 -115)
 
 	More cleanup of the dither code.
 
@@ -20667,7 +27579,9 @@
 
 2000-12-14	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.78) (+9 -4)
+	Files:	ChangeLog (1.62) (+54 -0)
+		Ghost/README (1.57) (+47 -16)
+		Makefile.am (1.78) (+9 -4)
 		README (1.37) (+1 -1)
 		print-dither.c (1.106) (+54 -52)
 		print-escp2.c (1.280) (+31 -23)
@@ -20705,7 +27619,18 @@
 
 2000-12-10	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.102) (+11 -1)
+	Files:	cups/genppd.c (1.14) (+51 -66)
+		cups/rastertoprinter.c (1.11) (+19 -32)
+
+	Use new describe_resolution member function to get information about
+	a specific resolution rather than trying to parse it; pass the
+	resolution index number in cupsCompression; set default dithering
+	mode to adaptive hybrid.  Reviewed by Mike.
+
+2000-12-10	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.61) (+63 -0)
+		print-canon.c (1.102) (+11 -1)
 		print-escp2.c (1.278) (+24 -1)
 		print-lexmark.c (1.9) (+11 -1)
 		print-pcl.c (1.101) (+18 -1)
@@ -20722,7 +27647,8 @@
 
 2000-12-09	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.77) (+1 -1)
+	Files:	LICENSE (1.1) (added)
+		Makefile.am (1.77) (+1 -1)
 		print-escp2.c (1.276) (+21 -21)
 
 	Change some resolution names in Epson driver.
@@ -20761,7 +27687,10 @@
 
 2000-12-04	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.100) (+16 -1)
+	Files:	ChangeLog (1.60) (+57 -0)
+		README.dither (1.9) (+12 -0)
+		configure.in (1.39) (+19 -15)
+		print-dither.c (1.100) (+16 -1)
 		print-pcl.c (1.100) (+53 -1)
 		print.h (1.95) (+3 -2)
 
@@ -20796,7 +27725,8 @@
 
 2000-11-29	<gandy@sourceforge.net>
 
-	Files:	print-canon.c (1.99) (+11 -11)
+	Files:	README.new-printer (1.4) (+65 -0)
+		print-canon.c (1.99) (+11 -11)
 
 	Added some documentation regarding print-canon.c
 
@@ -20815,22 +27745,14 @@
 
 2000-11-28	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.19) (+25 -3)
+	Files:	ChangeLog (1.59) (+89 -0)
+		escputil.c (1.19) (+25 -3)
 		print-color.c (1.3) (+3 -31)
 
 	Hue adjustment does nothing useful in solid colors mode.
 
 	Retry reading from printer in escputil for better reliability.
 
-2000-11-27	<rlk@sourceforge.net>
-
-	Files:	print-util.c (1.150.2.1) (+2 -2)
-
-	Fix posterization at low saturation.
-
-	Release 4.0.4 for emergency configure problem (bug 116313 popped up
-	again due to my system upgrade).
-
 2000-11-27	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.97) (+2 -2)
@@ -20848,13 +27770,22 @@
 	Add support for 1440 dpi vertical resolution to Epson driver (in
 	case anyone wants to experiment with this).
 
+2000-11-26	<rlk@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.21) (+4 -4)
+		cups/README.txt (1.8) (+1 -1)
+
+	Rename calibrate to cups-calibrate.
+
 2000-11-25	<rlk@sourceforge.net>
 
-	Files:	print-color.c (1.2) (+3 -6)
+	Files:	Ghost/README (1.56) (+2 -2)
+		print-color.c (1.2) (+3 -6)
 		print-dither.c (1.98) (+11 -2)
 		print-escp2.c (1.272) (+65 -27)
 		print-lexmark.c (1.6) (+36 -12)
 		print-pcl.c (1.97) (+36 -12)
+		printers.xml (1.37) (+66 -0)
 
 	Increase the resolution of the hue mapper
 
@@ -20870,6 +27801,24 @@
 
 2000-11-21	<rlk@sourceforge.net>
 
+	Files:	FAQ.html (1.2) (+58 -36)
+
+	Updates
+
+2000-11-21	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.55) (+119 -30)
+
+	Improved documentation
+
+2000-11-21	<ttonino@sourceforge.net>
+
+	Files:	FAQ.html (1.1) (added)
+
+	First attempt at a FAQ.
+
+2000-11-21	<rlk@sourceforge.net>
+
 	Files:	print-dither.c (1.97) (+14 -5)
 
 	Make dither_set_black_levels do something useful.
@@ -20888,7 +27837,8 @@
 
 2000-11-19	<rlk@sourceforge.net>
 
-	Files:	print-lexmark.c (1.5) (+31 -4)
+	Files:	ChangeLog (1.58) (+93 -0)
+		print-lexmark.c (1.5) (+31 -4)
 
 	Color correction
 
@@ -20910,8 +27860,13 @@
 
 2000-11-19	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.76) (+6 -4)
-		print-color.c (1.1) ( )
+	Files:	Ghost/.cvsignore (1.5) (+5 -0)
+		Ghost/contrib.mak.addon (1.11) (+4 -0)
+		Ghost/devs.mak.addon-5.10 (1.6) (+4 -0)
+		Makefile.am (1.76) (+6 -4)
+		cups/.cvsignore (1.5) (+3 -1)
+		cups/Makefile.in (1.20) (+8 -5)
+		print-color.c (1.1) (added)
 		print-util.c (1.153) (+2 -1537)
 
 	Split print-util into print-util.c and print-color.c.
@@ -20929,12 +27884,6 @@
 
 	Hue mapping to improve color
 
-2000-11-18	<rlk@sourceforge.net>
-
-	Files:	print-pcl.c (1.87.2.2) (+37 -2)
-
-	Per Dave Hill, the 1200C cannot print CMYK, only CMY or K.
-
 2000-11-18	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.93) (+5 -0)
@@ -20945,6 +27894,7 @@
 2000-11-18	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.92) (+37 -2)
+		printers.xml (1.36) (+1 -1)
 
 	Although the 1200C has CMYK ink, it cannot use K at the same time as
 	CMY! Split it off from the 1600 (which *may* be able to do this). Thanks
@@ -20952,9 +27902,31 @@
 
 2000-11-18	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.18) (+4 -2)
+	Files:	Ghost/gdevstp.c (1.45) (+7 -2)
+
+	122776 Ghostscript still ignores printer variables
+
+2000-11-18	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.10) (+4 -0)
+		Ghost/devs.mak.addon-5.10 (1.5) (+4 -0)
+
+	Lexmark driver
+
+2000-11-18	<rlk@sourceforge.net>
+
+	Files:	cups/.cvsignore (1.4) (+10 -8)
+
+	Add new stuff
+
+2000-11-18	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.57) (+200 -0)
+		Ghost/README (1.54) (+4 -0)
+		escputil.c (1.18) (+4 -2)
 		print-escp2.c (1.267) (+14 -3)
 		print-util.c (1.151) (+3 -1)
+		printers.xml (1.35) (+18 -1)
 
 	1) Support for the Stylus Photo 790 (new printer on the Epson HK web site,
 	   not currently on the US site).  Also list the 680, which appears to
@@ -20963,19 +27935,25 @@
 	2) In update_cmyk in print-util.c, don't bail out if it's all black.
 	   However, there may be another error which I need to look at.
 
+2000-11-18	<rwisi@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.19) (+3 -3)
+
+	Inserted missing cups-lexmark.o
+
 2000-11-18	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.75) (+4 -3)
 		print-dither.c (1.96) (+9 -1)
 		print-escp2.c (1.266) (+326 -210)
+		printers.xml (1.34) (+11 -3)
 		ran.509.131.h (1.2) (+22 -0)
 
 	Support 2880x720
 
 2000-11-18	<mitsch@sourceforge.net>
 
-	Files:	print.c (1.128.2.1) (+6 -2)
-		print.c (1.129) (+6 -2)
+	Files:	print.c (1.129) (+6 -2)
 
 	To make copying files to gimpcvs easier, check for INIT_I18N_UI
 	and use that macro instead of INIT_LOCALE if it exists.
@@ -20990,37 +27968,74 @@
 
 2000-11-12	<rwisi@sourceforge.net>
 
-	Files:	Makefile.am (1.74) (+1 -0)
-		print-lexmark.c (1.1) ( )
+	Files:	Ghost/README (1.53) (+1 -0)
+		Makefile.am (1.74) (+1 -0)
+		print-lexmark.c (1.1) (added)
 		print.h (1.91) (+14 -2)
 		printdefy.y (1.12) (+12 -1)
+		printers.xml (1.33) (+8 -0)
 
 	Added support for Lexmark Z52.
 
+2000-11-12	<sharkey@sourceforge.net>
+
+	Files:	make-deb.sh (1.3) (+1 -1)
+
+	Adjust for the fact that the format of /etc/debian_version has changed.
+
+2000-11-12	<sharkey@sourceforge.net>
+
+	Files:	debian/changelog (1.2) (+6 -0)
+
+	Bump the revision number up to 4.0.2.
+
+2000-11-12	<sharkey@sourceforge.net>
+
+	Files:	Ghost/debian-patch (1.2) (+15 -21)
+
+	Slightly change the way Ghostscript is packaged for Debian.
+
+	Originally, this patch would allow you to compile a package named
+	"gs-stp", which would both conflict with and provide the original gs package.
+
+	Unfortunately, gs-pdfencrypt has a versioned depends on gs, and dpkg does
+	not support a versioned provides, so you can't install gs-pdfencrypt with
+	gs-stp.  At least, not as far as I can figure.
+
+	So the solution is to not make a "gs-stp" package, but a new gs package,
+	with "stp" appended to the version number (5.10stp).  This allows
+	everything to work.
+
 2000-11-11	<ttonino@sourceforge.net>
 
-	Files:	ran.509.131.h (1.1) ( )
+	Files:	ran.509.131.h (1.1) (added)
 
 	Generated new matrix for printers with 4:1 resolution, for example 2880x720
 	DPI.
 
 2000-11-06	<gandy@sourceforge.net>
 
-	Files:	print-canon.c (1.89.2.3) (+2 -2)
+	Files:	print-canon.c (1.94) (+2 -2)
+
+	Fixed malformed debug message
 
-	Fixed malformed debugmessage
+2000-11-03	<rlk@sourceforge.net>
 
-2000-11-06	<gandy@sourceforge.net>
+	Files:	cups/rastertoprinter.c (1.10) (+3 -2)
 
-	Files:	print-canon.c (1.94) (+2 -2)
+	Need to do yellow too
 
-	Fixed malformed debug message
+2000-11-03	<rlk@sourceforge.net>
+
+	Files:	cups/rastertoprinter.c (1.9) (+8 -2)
+
+	Attempt to fix 121170
 
-2000-11-04	<rlk@sourceforge.net>
+2000-11-03	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.89.2.2) (+8 -2)
+	Files:	Ghost/gdevstp.c (1.44) (+3 -3)
 
-	121601 Canon driver fails with no specified InkType
+	Try to fix 121169
 
 2000-10-31	<rlk@sourceforge.net>
 
@@ -21032,48 +28047,37 @@
 
 	Files:	.cvsignore (1.10) (+1 -0)
 		Makefile.am (1.72) (+3 -0)
+		configure.in (1.38) (+7 -1)
 
 	escputil man page
 
+2000-10-31	<rlk@sourceforge.net>
+
+	Files:	escputil.1.in (1.1) (added)
+
+	Man page for escputil.
+
 2000-10-29	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.91) (+15 -13)
+		printers.xml (1.32) (+4 -4)
 
 	Latest version of Tommy's CRET patch.
 	Changed 810/812/842 and 895 printers to the 840 CRET driver.
 
 2000-10-29	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.71) (+1 -1)
+	Files:	INSTALL (1.6) (+1 -15)
+		Makefile.am (1.71) (+1 -1)
 		escputil.c (1.17) (+2 -2)
 		print-pcl.c (1.90) (+2 -2)
 
 	Bring over a few fixes from 4.0+
 
-2000-10-29	<rlk@sourceforge.net>
-
-	Files:	escputil.c (1.15.2.2) (+2 -2)
-
-	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-24	<gandy@sourceforge.net>
-
-	Files:	print-canon.c (1.89.2.1) (+2 -2)
-
-	Fixed a bug leading to wrong horizontal offsets when xdpi != ydpi
-
-2000-10-23	<rlk@sourceforge.net>
-
-	Files:	print-pcl.c (1.87.2.1) (+2 -2)
-
-	116840 LaserJet 4 can do 600 DPI
-
 2000-10-23	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.89) (+45 -6)
+		printers.xml (1.31) (+1 -1)
 
 	Updated to latest version of Tommy's patch, plus fixed 8xx C-RET.
 
@@ -21085,6 +28089,16 @@
 
 2000-10-22	<gandy@sourceforge.net>
 
+	Files:	cups/Makefile.in (1.18) (+25 -4)
+		cups/canon.c (1.1) (added)
+		cups/commandtocanon.c (1.1) (added)
+
+	Added preliminary support for canon printers in cups - alls existing commands
+	are working except for ink level determination. Some canon specific commands
+	are missing for lack of cups-commands files.
+
+2000-10-22	<gandy@sourceforge.net>
+
 	Files:	print-canon.c (1.92) (+8 -2)
 
 	Changed fallback behaviour for unspecified inktypes: CMYK, CMY or K are
@@ -21093,48 +28107,108 @@
 
 2000-10-21	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.15.2.1) (+2 -1)
-		escputil.c (1.16) (+2 -1)
+	Files:	escputil.c (1.16) (+2 -1)
 
 	117385 escputil doesn't work with old printers if -m is specified
 
 2000-10-20	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.91) (+11 -1)
+		printers.xml (1.30) (+8 -0)
 
 	Added support for the Canon BJC-6200 -- Mostly functional, quite good output
 
 2000-10-20	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.90) (+12 -1)
+		printers.xml (1.29) (+8 -0)
 
 	Added support for Canon BJC-30 as suggested by Tim Hanham
 
 2000-10-20	<rlk@sourceforge.net>
 
 	Files:	README (1.36) (+6 -11)
+		RELNOTES (1.34) (+1 -931)
+		configure.in (1.37) (+1 -1)
 		print-pcl.c (1.88) (+40 -8)
 
 	Tommy Schultz Lassen's CRET patch; initialize 4.1 branch
 
+2000-10-20	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.56) (+9 -0)
+
+	4.0.0rc1
+
 2000-10-19	<rlk@sourceforge.net>
 
-	Files:	README (1.35) (+24 -5)
+	Files:	ChangeLog (1.55) (+102 -0)
+		README (1.35) (+24 -5)
+		RELNOTES (1.33) (+191 -2)
+		configure.in (1.36) (+1 -1)
 
 	4.0.0rc1 prep
 
 2000-10-18	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.52) (+35 -26)
+
+	Clarifications
+
+2000-10-18	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.265) (+6 -6)
 
 	116864 Part of bottom edge goes onto second page (still)
 
 2000-10-17	<rlk@sourceforge.net>
 
+	Files:	gimp.m4 (1.1) (added)
+
+	A (hopefully) safe gimp.m4 for use with aclocal
+
+2000-10-17	<easysw@sourceforge.net>
+
+	Files:	cups/epson.c (1.7) (+32 -7)
+		cups/genppd.c (1.13) (+7 -7)
+
+	Fixed PPD file generation - sscanf() commands didn't work right.
+
+	The epson backend would error out on backchannel read errors, resulting
+	in no output.
+
+	The epson backend didn't handle Mandrake 7.x's incorrect /dev/usb/usblp#
+	filenames.
+
+2000-10-17	<rlk@sourceforge.net>
+
 	Files:	print-weave.c (1.7) (+2 -2)
 
 	Remove C++ comment
 
+2000-10-16	<easysw@sourceforge.net>
+
+	Files:	cups/calibrate.c (1.7) (+68 -3)
+		cups/rastertoprinter.c (1.8) (+4 -3)
+
+	Added patch from Till for calibrate utility, with corrected grammer,
+	spelling, and code...
+
+	Added cast to buffer in call to cupsRasterReadPixels()...
+
+2000-10-16	<easysw@sourceforge.net>
+
+	Files:	cups/README.txt (1.7) (+3 -3)
+
+	Updated README to indicate requirement for CUPS 1.1.4.
+
+2000-10-16	<rlk@sourceforge.net>
+
+	Files:	printers.xml (1.28) (+402 -402)
+
+	Sort the printers in a slightly different order (alphabetic by
+	manufacturer, and then by printer type name).
+
 2000-10-16	<rlk@sourceforge.net>
 
 	Files:	print-pcl.c (1.87) (+8 -2)
@@ -21161,6 +28235,7 @@
 		gimp_main_window.c (1.68) (+14 -1)
 		gtk_main_window.c (1.58) (+14 -1)
 		print.c (1.128) (+21 -6)
+		printers.xml (1.27) (+8 -0)
 
 	Proposed fixes for:
 
@@ -21170,6 +28245,18 @@
 	116846 scaling doesn't reload properly in PPI mode
 	116851 escputil has unnecessary GNU library dependency
 
+2000-10-13	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.54) (+6 -0)
+
+	4.0b3 changelog
+
+2000-10-12	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.53) (+60 -0)
+
+	4.0b3 release
+
 2000-10-12	<rlk@sourceforge.net>
 
 	Files:	gimp_main_window.c (1.67) (+4 -2)
@@ -21178,7 +28265,9 @@
 
 2000-10-12	<easysw@sourceforge.net>
 
-	Files:	print-util.c (1.150) (+3 -4)
+	Files:	cups/genppd.c (1.12) (+17 -2)
+		cups/rastertoprinter.c (1.7) (+3 -2)
+		print-util.c (1.150) (+3 -4)
 
 	Changed /'s in size names to dashes - /'s not compatible with PPD files...
 
@@ -21189,10 +28278,39 @@
 
 2000-10-12	<rlk@sourceforge.net>
 
-	Files:	README (1.34) (+1 -1)
+	Files:	Ghost/README (1.51) (+54 -40)
+
+	116084: Update to Debian info in Ghost/README
+
+2000-10-12	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.52) (+44 -0)
+		README (1.34) (+1 -1)
+		RELNOTES (1.32) (+74 -1)
+		configure.in (1.35) (+1 -1)
 
 	Prep for 4.0b3
 
+2000-10-12	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.17) (+3 -3)
+		cups/genppd.c (1.11) (+13 -10)
+		cups/rastertoprinter.c (1.6) (+48 -11)
+
+	Fixes for PCL and BJC driver resolutions - they use XRESxYRES, while the
+	EPSON driver uses "XRES x YRES"...
+
+	Added monochrome resolution mode for PCL driver.
+
+	Added mergevars and validatevars calls per Robert's patch.
+
+	The install target now depends on "all".
+
+	Added code to limit the number of lines read to the raster height, and
+	to flush any unused lines in the buffer.  This should only be needed if
+	the GIMP-print driver code gives up on printing before reading all of the
+	image data...
+
 2000-10-11	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.69) (+21 -0)
@@ -21201,7 +28319,8 @@
 
 2000-10-11	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.68) (+1 -1)
+	Files:	Ghost/README.bsd (1.1) (added)
+		Makefile.am (1.68) (+1 -1)
 
 	Description about how to build GhostScript under BSD
 
@@ -21213,16 +28332,51 @@
 
 2000-10-10	<rlk@sourceforge.net>
 
+	Files:	README.escp2 (1.13) (+135 -12)
+
+	More remote mode goodies
+
+2000-10-10	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.264) (+8 -8)
 		print-util.c (1.149) (+13 -1)
+		printers.xml (1.26) (+10 -7)
 
 	115794 ESC 480 doesn't print
 	116113 print-escp2.c requires #include <sys/types.h> (not really)
 	116286 Some PCL paper sizes listed in print-pcl but not print-util
 
+2000-10-10	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.9) (+1 -1)
+		Ghost/devs.mak.addon-5.10 (1.4) (+1 -1)
+		Ghost/gdevstp.c (1.43) (+6 -3)
+
+	116211 Ghostscript driver does not pass printer variables through.
+	116213 Ghostscript makefile fragments missing dependency.
+
+2000-10-05	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.51) (+29 -0)
+
+	gimp-print 4.0b2 release
+
+2000-10-05	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.31) (+9 -2)
+
+	Minor updates
+
 2000-10-04	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.66) (+4 -1)
+	Files:	RELNOTES (1.30) (+34 -3)
+
+	Updates
+
+2000-10-04	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.50) (+70 -0)
+		gimp_main_window.c (1.66) (+4 -1)
 		gtk_color_window.c (1.21) (+2 -2)
 		gtk_main_window.c (1.57) (+4 -1)
 		print.c (1.127) (+4 -3)
@@ -21255,6 +28409,12 @@
 
 2000-10-02	<rlk@sourceforge.net>
 
+	Files:	RELNOTES (1.29) (+12 -1)
+
+	More updates
+
+2000-10-02	<rlk@sourceforge.net>
+
 	Files:	README (1.33) (+3 -3)
 
 	Minor updates
@@ -21274,12 +28434,19 @@
 2000-10-01	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.85) (+50 -1)
+		printers.xml (1.25) (+1 -1)
 
 	Created new model "901" for large format 900 series printers. Moved
 	DJ 1220C into it. [Bruce Burden]
 
 2000-10-01	<rlk@sourceforge.net>
 
+	Files:	RELNOTES (1.28) (+22 -12)
+
+	Updates
+
+2000-10-01	<rlk@sourceforge.net>
+
 	Files:	print-util.c (1.147) (+2 -2)
 
 	115774: photo mode default saturation is excessive.  It appears from
@@ -21288,6 +28455,20 @@
 
 2000-09-30	<rlk@sourceforge.net>
 
+	Files:	ChangeLog (1.49) (+29 -0)
+
+	Turns out that it's really bad juju not to have the change log there
+	from the very start.  Oh well...
+
+2000-09-30	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.48) (removed)
+
+	The change log is generated from the CVS log; there's no good reason
+	to have it in the repository.
+
+2000-09-30	<rlk@sourceforge.net>
+
 	Files:	print-util.c (1.146) (+3 -3)
 
 	Fix 4A paper size.
@@ -21303,7 +28484,15 @@
 
 2000-09-29	<rlk@sourceforge.net>
 
-	Files:	print-util.c (1.144) (+41 -25)
+	Files:	ChangeLog (1.47) (+80 -0)
+		RELNOTES (1.27) (+54 -6)
+
+	Update release notes and snapshot for Mandrake 7.2
+
+2000-09-29	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.42) (+8 -1)
+		print-util.c (1.144) (+41 -25)
 
 	Fix 115513:
 
@@ -21316,6 +28505,12 @@
 
 2000-09-28	<rlk@sourceforge.net>
 
+	Files:	Ghost/gdevstp.c (1.41) (+9 -2)
+
+	Accept stpMediaSize as an alias for MediaSize (115450)
+
+2000-09-28	<rlk@sourceforge.net>
+
 	Files:	print-canon.c (1.88) (+6 -1)
 		print-dither.c (1.95) (+6 -1)
 		print-escp2.c (1.261) (+6 -5)
@@ -21359,7 +28554,10 @@
 
 2000-09-23	<rlk@sourceforge.net>
 
-	Files:	README (1.31) (+4 -2)
+	Files:	ChangeLog (1.46) (+71 -0)
+		README (1.31) (+4 -2)
+		RELNOTES (1.26) (+16 -2)
+		configure.in (1.34) (+1 -1)
 		gimp_main_window.c (1.63) (+2 -2)
 		print.c (1.125) (+2 -11)
 
@@ -21388,7 +28586,7 @@
 
 2000-09-22	<ttonino@sourceforge.net>
 
-	Files:	Matgen/quickaspect.c (1.1) ( )
+	Files:	Matgen/quickaspect.c (1.1) (added)
 
 	Allows generation of matrices for non-square pixels
 
@@ -21399,12 +28597,44 @@
 
 	Placed code in the public domain.
 
+2000-09-22	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.16) (+21 -8)
+		cups/configure (1.7) (+6 -6)
+		cups/configure.in (1.8) (+7 -7)
+
+	Default to non-silent mode.  It sucks.
+
+	Added wrapper test around mkdir commands to eliminate warnings that
+	directory already exists.
+
 2000-09-21	<easysw@sourceforge.net>
 
 	Files:	Makefile.am (1.67) (+1 -0)
 
 	Added missing command.types and calibrate.ppm to Makefile.am.
 
+2000-09-21	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.15) (+60 -58)
+		cups/configure (1.6) (+75 -56)
+		cups/configure.in (1.7) (+14 -2)
+
+	New "--enable-silent" option for CUPS drivers; use "--disable-silent" to
+	get all of the compiler commands during a make.
+
+2000-09-21	<easysw@sourceforge.net>
+
+	Files:	cups/calibrate.c (1.6) (+8 -1)
+
+	Merged change from Robert.
+
+2000-09-20	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.45) (+19 -0)
+
+	4.0b1 release
+
 2000-09-20	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.66) (+2 -1)
@@ -21413,13 +28643,63 @@
 
 2000-09-20	<rlk@sourceforge.net>
 
-	Files:	README (1.30) (+6 -9)
+	Files:	ChangeLog (1.44) (+131 -0)
+		README (1.30) (+6 -9)
 
 	4.0b1
 
+2000-09-20	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.25) (+46 -42)
+
+	Slight reorganization
+
+2000-09-20	<rlk@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.14) (+3 -3)
+
+	Fix make clean
+
+2000-09-20	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.50) (+1 -1)
+
+	Sort the results
+
+2000-09-20	<rlk@sourceforge.net>
+
+	Files:	cups/calibrate.c (1.5) (+2 -2)
+
+	cupsProfile -> cupsColorProfile
+
+2000-09-20	<davehill@sourceforge.net>
+
+	Files:	Ghost/README (1.49) (+26 -13)
+		RELNOTES (1.24) (+28 -1)
+
+	Updated for the PCL printer changes.
+
+2000-09-18	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.13) (+4 -2)
+		cups/genppd.c (1.10) (+6 -7)
+
+	Added LDFLAGS and LIBS to initial output from makefile.
+
+	Changed to use GIMP-print version number and name in PPD files; the
+	NickName field shows "CUPS+GIMP-print v4.0" to differentiate the
+	driver from the Ghostscript STP driver PPD file.
+
 2000-09-18	<easysw@sourceforge.net>
 
-	Files:	print-escp2.c (1.259) (+2 -2)
+	Files:	cups/Makefile.in (1.12) (+56 -29)
+		cups/README.txt (1.6) (+7 -5)
+		cups/calibrate.c (1.4) (+5 -3)
+		cups/commandtoepson.c (1.7) (+3 -4)
+		cups/configure (1.5) (+118 -56)
+		cups/configure.in (1.6) (+58 -1)
+		cups/epson.c (1.6) (+3 -6)
+		print-escp2.c (1.259) (+2 -2)
 
 	Updated print densities for 2000P; the previous ones were just a little
 	low, so I bumped them by 20%.
@@ -21438,6 +28718,7 @@
 2000-09-17	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.82) (+59 -2)
+		printers.xml (1.24) (+3 -3)
 
 	Split LaserJet 5 and 6 from LaserJet 4 (they support 600x600dpi).
 	Split LaserJet 5Si from 4V, 4Si (same).
@@ -21452,6 +28733,7 @@
 2000-09-17	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.81) (+20 -23)
+		printers.xml (1.23) (+90 -10)
 
 	The "Deskjet 800 saga...
 
@@ -21489,7 +28771,10 @@
 
 2000-09-17	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.65) (+7 -5)
+	Files:	ChangeLog (1.43) (+78 -0)
+		Ghost/Makefile (1.1) (added)
+		Ghost/README (1.48) (+22 -17)
+		Makefile.am (1.65) (+7 -5)
 		README (1.29) (+6 -0)
 		print-dither.c (1.94) (+2 -2)
 		print-util.c (1.142) (+234 -10)
@@ -21522,8 +28807,18 @@
 
 2000-09-17	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.64) (+1 -1)
+	Files:	ChangeLog (1.42) (+24 -0)
+		Documentation/color.png (1.2) (removed)
+		Documentation/main.png (1.2) (removed)
+		Documentation/print-color.png (1.1) (added)
+		Documentation/print-main.png (1.1) (added)
+		Documentation/print-setup.png (1.1) (added)
+		Documentation/print.html (1.2) (+584 -197)
+		Documentation/print.sgml (1.1) (added)
+		Documentation/setup.png (1.2) (removed)
+		Makefile.am (1.64) (+1 -1)
 		README (1.28) (+9 -2)
+		RELNOTES (1.23) (+42 -7)
 		gimp_color_window.c (1.19) (+7 -4)
 		gimp_main_window.c (1.62) (+60 -15)
 		print-escp2.c (1.257) (+2 -2)
@@ -21553,9 +28848,26 @@
 
 	Update documentation per Daniel Egger.
 
+2000-09-17	<rlk@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.11) (+7 -17)
+		cups/calibrate.c (1.3) (+2 -3)
+		cups/commandtoepson.c (1.6) (+4 -2)
+		cups/configure (1.4) (+26 -26)
+		cups/configure.in (1.5) (+2 -2)
+		cups/epson.c (1.5) (+4 -2)
+
+	Remove -fno-rtti, since we're not using C++ and it breaks gcc (2.7.2.3).
+
+	Clean up some warnings.
+
+	.SILENT in makefiles is simply too unpleasant to debug.
+
 2000-09-16	<easysw@sourceforge.net>
 
-	Files:	print-dither.c (1.93) (+86 -113)
+	Files:	configure.in (1.33) (+30 -3)
+		cups/genppd.c (1.9) (+6 -5)
+		print-dither.c (1.93) (+86 -113)
 		testdither.c (1.2) (+39 -19)
 
 	Added configure check for random() and a new option --enable-debug.
@@ -21570,12 +28882,23 @@
 
 2000-09-16	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.63) (+3 -0)
+	Files:	ChangeLog (1.41) (+58 -0)
+		Makefile.am (1.63) (+3 -0)
 
 	Add documentation to the release
 
 2000-09-16	<rlk@sourceforge.net>
 
+	Files:	Documentation/color.png (1.1) (added)
+		Documentation/docbook.css (1.1) (added)
+		Documentation/main.png (1.1) (added)
+		Documentation/print.html (1.1) (added)
+		Documentation/setup.png (1.1) (added)
+
+	Initial revision of documentation
+
+2000-09-16	<rlk@sourceforge.net>
+
 	Files:	gimp_main_window.c (1.61) (+2 -2)
 
 	Enlarge the Center Image button.
@@ -21588,7 +28911,9 @@
 
 2000-09-16	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.18) (+24 -74)
+	Files:	ChangeLog (1.40) (+80 -0)
+		Ghost/README (1.47) (+3 -0)
+		gimp_color_window.c (1.18) (+24 -74)
 		gimp_main_window.c (1.59) (+2 -5)
 		print-dither.c (1.92) (+165 -132)
 
@@ -21606,6 +28931,12 @@
 
 	Turn a few more option-menus into combo boxes.
 
+2000-09-15	<rlk@sourceforge.net>
+
+	Files:	mkchlog (1.4) (+5 -0)
+
+	Put mkchlog in the public domain.
+
 2000-09-15	<cpbs@sourceforge.net>
 
 	Files:	print.c (1.120) (+6 -3)
@@ -21624,6 +28955,9 @@
 2000-09-15	<rlk@sourceforge.net>
 
 	Files:	AUTHORS (1.6) (+2 -0)
+		ChangeLog (1.39) (+255 -0)
+		RELNOTES (1.22) (+37 -6)
+		configure.in (1.32) (+1 -1)
 		print-dither.c (1.91) (+28 -24)
 		print-escp2.c (1.256) (+3 -3)
 
@@ -21635,7 +28969,8 @@
 
 2000-09-15	<easysw@sourceforge.net>
 
-	Files:	print-util.c (1.140) (+13 -13)
+	Files:	cups/genppd.c (1.8) (+13 -13)
+		print-util.c (1.140) (+13 -13)
 
 	Re-fixed media sizes so they match up exactly with the PPD spec and not
 	the original (broken) tables I was using in Print Pro...
@@ -21643,7 +28978,7 @@
 2000-09-15	<easysw@sourceforge.net>
 
 	Files:	Makefile.am (1.62) (+5 -0)
-		testdither.c (1.1) ( )
+		testdither.c (1.1) (added)
 
 	Added simple dither testing program so I/we can fiddle with the
 	dithering code and get some more immediate feedback.
@@ -21673,6 +29008,12 @@
 
 	Disable 1440x720 micro on 640/660
 
+2000-09-13	<rlk@sourceforge.net>
+
+	Files:	Makefile.standalone (1.11) (removed)
+
+	Obsolete
+
 2000-09-13	<easysw@sourceforge.net>
 
 	Files:	print-escp2.c (1.254) (+446 -394)
@@ -21692,6 +29033,13 @@
 
 2000-09-13	<rlk@sourceforge.net>
 
+	Files:	mkinstalldirs (1.3) (+9 -3)
+
+	Really brutal hack to allow make gdist to work while not blowing out
+	make install
+
+2000-09-13	<rlk@sourceforge.net>
+
 	Files:	Makefile.am (1.61) (+1 -0)
 
 	Set up MAINTAINERdir correctly
@@ -21749,14 +29097,30 @@
 
 2000-09-12	<rlk@sourceforge.net>
 
-	Files:	quickmatrix199-2.h (1.3) (+0 -0)
-		quickmatrix199.h (1.3) (+0 -0)
+	Files:	quickmatrix199-2.h (1.3) (removed)
+		quickmatrix199.h (1.3) (removed)
 
 	Remove big unused files from sandboxes (they're still in the repository
 	if needed).
 
 2000-09-11	<rlk@sourceforge.net>
 
+	Files:	jmv/README (1.3) (+3 -0)
+		jmv/print-dither.c (1.32) (removed)
+		jmv/print-escp2.c (1.32) (removed)
+		jmv/print.h (1.3) (removed)
+
+	Remove some extraneous files to clean up sandboxes.
+
+2000-09-11	<rlk@sourceforge.net>
+
+	Files:	Matgen/73dither-distance.i (1.2) (removed)
+		Matgen/ran.367.179.h (1.2) (removed)
+
+	No good reason to clutter everyone's sandbox with these, because they're big.
+
+2000-09-11	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.252) (+3 -3)
 
 	Drop support for 1440x720 microweave on 740 and 900.
@@ -21794,12 +29158,47 @@
 2000-09-10	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.248) (+291 -24)
+		run-weavetest (1.19) (+1 -1)
 
 	Try to support ESC 900 3 pl dots
 
 2000-09-10	<easysw@sourceforge.net>
 
+	Files:	cups/LICENSE.txt (1.2) (+0 -523)
+
+	Forgot this file...
+
+2000-09-10	<easysw@sourceforge.net>
+
+	Files:	cups/genppd.c (1.7) (+4 -4)
+
+	Didn't include setpagedevice after color stuff...
+
+2000-09-10	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.10) (+8 -3)
+		cups/command.types (1.2) (+16 -10)
+		cups/configure (1.3) (+26 -26)
+		cups/genppd.c (1.6) (+36 -10)
+
+	Updated copyright notice on other files.
+
+	Added installation of command.types file.
+
+	No longer generate PPD files for the PS drivers.
+
+2000-09-10	<easysw@sourceforge.net>
+
 	Files:	Makefile.am (1.58) (+0 -5)
+		configure.in (1.31) (+0 -59)
+		cups/Makefile.in (1.9) (+16 -10)
+		cups/README.txt (1.5) (+30 -16)
+		cups/calibrate.c (1.2) (+16 -10)
+		cups/command.txt (1.2) (+30 -25)
+		cups/commandtoepson.c (1.5) (+15 -9)
+		cups/configure.in (1.4) (+14 -8)
+		cups/epson.c (1.4) (+16 -10)
+		cups/rastertoprinter.c (1.5) (+14 -8)
 		print.c (1.115) (+101 -58)
 
 	Run-time detection of lpc/lpstat.  Still need to add LPRng support to it.
@@ -21807,6 +29206,15 @@
 	Updated all of the CUPS driver stuff with the standard GPL and a more-or-
 	less standard banner on each file.
 
+2000-09-10	<easysw@sourceforge.net>
+
+	Files:	cups/.cvsignore (1.3) (+0 -4)
+
+	Can't ignore Makefile.in in the CUPS directory - remember, we're not using
+	automake with the CUPS drivers.
+
+	Dropped some of the other files that aren't in this directory.
+
 2000-09-10	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.247) (+79 -59)
@@ -21815,7 +29223,8 @@
 
 2000-09-09	<rlk@sourceforge.net>
 
-	Files:	gtk_color_window.c (1.20) (+5 -1)
+	Files:	configure.in (1.30) (+6 -2)
+		gtk_color_window.c (1.20) (+5 -1)
 		gtk_main_window.c (1.55) (+6 -1)
 		print.c (1.114) (+25 -12)
 		print_gimp.h (1.29) (+5 -1)
@@ -21824,14 +29233,40 @@
 
 2000-09-09	<rlk@sourceforge.net>
 
+	Files:	cups/.cvsignore (1.2) (+13 -0)
+
+	Copies of files that should be ignored.
+
+2000-09-09	<easysw@sourceforge.net>
+
+	Files:	cups/genppd.c (1.5) (+28 -13)
+
+	Added dithering algorithms to PPD files...
+
+2000-09-09	<easysw@sourceforge.net>
+
+	Files:	cups/rastertoprinter.c (1.4) (+3 -2)
+
+	Default to gamma of 1.7 to match sRGB; looks much better now...
+
+2000-09-09	<rlk@sourceforge.net>
+
 	Files:	AUTHORS (1.5) (+3 -0)
+		ChangeLog (1.38) (+45 -0)
+		Ghost/README (1.46) (+11 -20)
+		Ghost/gdevstp.c (1.40) (+13 -1)
 		Makefile.am (1.57) (+5 -0)
+		configure.in (1.29) (+5 -1)
+		mkinstalldirs (1.2) (+6 -2)
 
 	Add full foomatic support
 
 2000-09-09	<easysw@sourceforge.net>
 
-	Files:	print-util.c (1.137) (+7 -2)
+	Files:	cups/Makefile.in (1.8) (+12 -5)
+		cups/genppd.c (1.4) (+6 -6)
+		cups/rastertoprinter.c (1.3) (+11 -5)
+		print-util.c (1.137) (+7 -2)
 
 	Updated compute_page_parameters to support scaling == 0 (means to scale
 	to the full page regardless of aspect ratio)
@@ -21847,7 +29282,11 @@
 
 2000-09-09	<easysw@sourceforge.net>
 
-	Files:	escputil.c (1.9) (+3 -3)
+	Files:	configure.in (1.28) (+8 -2)
+		cups/Makefile.in (1.7) (+15 -7)
+		cups/README.txt (1.4) (+18 -12)
+		cups/configure.in (1.3) (+2 -2)
+		escputil.c (1.9) (+3 -3)
 
 	Updated top-level configuration script to only use GCC options when GCC
 	is being used...  -Wall and friends yield interesting (but not useful)
@@ -21864,13 +29303,15 @@
 2000-09-09	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.56) (+1 -0)
+		configure.in (1.27) (+11 -0)
 		print.c (1.113) (+11 -2)
 
 	Try to support LPRng
 
 2000-09-09	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.56) (+14 -7)
+	Files:	ChangeLog (1.37) (+96 -0)
+		gimp_main_window.c (1.56) (+14 -7)
 		gtk_main_window.c (1.54) (+29 -17)
 
 	Close off the setup and color dialogs correctly when printing.
@@ -21886,8 +29327,13 @@
 
 2000-09-09	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.55) (+4 -1)
+	Files:	ChangeLog (1.36) (+52 -0)
+		Ghost/README (1.45) (+2 -12)
+		Makefile.am (1.55) (+4 -1)
 		README (1.27) (+8 -2)
+		README.dither (1.8) (+14 -3)
+		README.weave (1.2) (+140 -1)
+		configure.in (1.26) (+48 -20)
 		printer_options.c (1.2) (+4 -1)
 
 	Add --disable-lp and --disable-lpr options to configure.
@@ -21897,9 +29343,26 @@
 
 	Other minor changes.
 
+2000-09-09	<rlk@sourceforge.net>
+
+	Files:	cups/README.txt (1.3) (+18 -0)
+
+	Instructions for people who use the CVS interface
+
+2000-09-09	<rlk@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.6) (+10 -18)
+
+	Make compile verbose enough so that it's possible to see what's going
+	on.
+
+	Improve robustness of ppd generation.
+
 2000-09-08	<easysw@sourceforge.net>
 
-	Files:	print-util.c (1.136) (+10 -10)
+	Files:	cups/genppd.c (1.3) (+343 -1512)
+		cups/rastertoprinter.c (1.2) (+17 -4)
+		print-util.c (1.136) (+10 -10)
 		printdefy.y (1.11) (+3 -3)
 
 	Fixed international A sizes (wrong values with width and height)
@@ -21916,6 +29379,10 @@
 2000-09-08	<easysw@sourceforge.net>
 
 	Files:	Makefile.am (1.54) (+2 -0)
+		cups/Makefile.in (1.5) (+31 -19)
+		cups/configure (1.2) (+83 -37)
+		cups/configure.in (1.2) (+4 -4)
+		cups/genppd.c (1.2) (+13 -9)
 
 	Fixed CUPS file generation rules.
 
@@ -21939,6 +29406,21 @@
 
 	Added CUPS source building targets a la Ghostscript driver.
 
+2000-09-08	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.4) (+12 -24)
+		cups/check.c (1.2) (removed)
+		cups/dither.c (1.3) (removed)
+		cups/epson.drv (1.3) (removed)
+		cups/pack.c (1.2) (removed)
+		cups/rastertoepson.c (1.4) (removed)
+		cups/rastertoprinter.c (1.1) (added)
+		cups/util.h (1.2) (removed)
+
+	Redid CUPS driver to use GIMP-print code directly, a la the stp driver.
+
+	Not sure how well this will work out, but we'll see...
+
 2000-09-07	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.246) (+2 -2)
@@ -21978,7 +29460,8 @@
 
 2000-09-06	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.53) (+1 -2)
+	Files:	ChangeLog (1.35) (+170 -0)
+		gimp_main_window.c (1.53) (+1 -2)
 		print-dither.c (1.88) (+4 -14)
 		print-escp2.c (1.243) (+1 -2)
 		print-util.c (1.134) (+6 -12)
@@ -22110,13 +29593,26 @@
 
 2000-09-05	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.44) (+1 -1)
+
+	-sDither, not -Dither!
+
+2000-09-05	<rlk@sourceforge.net>
+
 	Files:	README (1.26) (+1 -0)
 
 	4.0a3 release
 
 2000-09-05	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.50) (+2 -37)
+	Files:	RELNOTES (1.21) (+34 -13)
+
+	Updates
+
+2000-09-05	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.43) (+10 -4)
+		gimp_main_window.c (1.50) (+2 -37)
 		gtk_main_window.c (1.51) (+1 -31)
 		print-canon.c (1.83) (+2 -10)
 		print-dither.c (1.87) (+74 -57)
@@ -22129,7 +29625,9 @@
 
 2000-09-05	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.49) (+41 -7)
+	Files:	ChangeLog (1.34) (+78 -0)
+		Ghost/README (1.42) (+11 -1)
+		gimp_main_window.c (1.49) (+41 -7)
 		gtk_main_window.c (1.50) (+18 -2)
 		print-canon.c (1.82) (+10 -5)
 		print-dither.c (1.86) (+140 -115)
@@ -22175,6 +29673,8 @@
 2000-09-03	<rlk@sourceforge.net>
 
 	Files:	AUTHORS (1.4) (+64 -10)
+		Ghost/README (1.41) (+3 -2)
+		Ghost/gdevstp.c (1.39) (+2 -2)
 		gimp_main_window.c (1.48) (+16 -1)
 		gtk_main_window.c (1.49) (+16 -1)
 		print-canon.c (1.80) (+7 -3)
@@ -22204,7 +29704,8 @@
 
 2000-09-03	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.82) (+7 -7)
+	Files:	ChangeLog (1.33) (+93 -0)
+		print-dither.c (1.82) (+7 -7)
 		print-escp2.c (1.234) (+48 -48)
 		print-util.c (1.126) (+2 -2)
 		print-weave.c (1.2) (+2 -1)
@@ -22218,6 +29719,7 @@
 2000-09-02	<rlk@sourceforge.net>
 
 	Files:	README (1.25) (+1 -1)
+		configure.in (1.25) (+1 -1)
 
 	Bump version number
 
@@ -22235,7 +29737,12 @@
 
 2000-09-02	<rlk@sourceforge.net>
 
-	Files:	escp2-unprint.c (1.3) (+4 -4)
+	Files:	ChangeLog (1.32) (+336 -0)
+		Ghost/README (1.40) (+3 -1)
+		Ghost/gdevstp.c (1.38) (+9 -9)
+		README.new-printer (1.3) (+4 -0)
+		RELNOTES (1.20) (+97 -1)
+		escp2-unprint.c (1.3) (+4 -4)
 		gimp_main_window.c (1.46) (+43 -41)
 		gtk_color_window.c (1.18) (+9 -17)
 		gtk_main_window.c (1.47) (+41 -47)
@@ -22247,6 +29754,7 @@
 		print-util.c (1.125) (+43 -47)
 		print.c (1.111) (+2 -23)
 		printdefy.y (1.9) (+6 -6)
+		printers.xml (1.22) (+18 -0)
 
 	Further tuning of color generation.  At present, CMY controls can be
 	used to balance grayscale reasonably effectively.  The grayscale for
@@ -22310,7 +29818,8 @@
 2000-08-29	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.52) (+5 -1)
-		printer_options.c (1.1) ( )
+		README.new-printer (1.2) (+10 -8)
+		printer_options.c (1.1) (added)
 
 	Add printer_options program to generate *-omatic database.
 
@@ -22331,13 +29840,20 @@
 
 2000-08-29	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.39) (+1 -0)
+
+	Note support for the ESP 2000P
+
+2000-08-29	<rlk@sourceforge.net>
+
 	Files:	gimp_main_window.c (1.44) (+3 -3)
 
 	Permit scaling down to lower scale limit, not necessarily just 5%.
 
 2000-08-28	<rlk@sourceforge.net>
 
-	Files:	print-util.c (1.122) (+4 -4)
+	Files:	Ghost/README (1.38) (+3 -3)
+		print-util.c (1.122) (+4 -4)
 
 	Allow more CMY boost
 
@@ -22363,7 +29879,9 @@
 
 2000-08-28	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.15) (+82 -59)
+	Files:	Ghost/README (1.37) (+6 -6)
+		Ghost/gdevstp.c (1.37) (+29 -24)
+		gimp_color_window.c (1.15) (+82 -59)
 		gimp_main_window.c (1.43) (+12 -8)
 		gtk_color_window.c (1.17) (+134 -112)
 		print-util.c (1.119) (+167 -25)
@@ -22392,7 +29910,9 @@
 
 2000-08-25	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.14) (+2 -2)
+	Files:	Ghost/README (1.36) (+1 -1)
+		Ghost/gdevstp.c (1.36) (+2 -2)
+		gimp_color_window.c (1.14) (+2 -2)
 		gtk_color_window.c (1.16) (+2 -2)
 		print-util.c (1.118) (+12 -6)
 
@@ -22424,6 +29944,7 @@
 2000-08-24	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.224) (+18 -18)
+		printers.xml (1.21) (+8 -0)
 
 	Fix definition of 670 (from visual inspection).
 
@@ -22484,6 +30005,12 @@
 
 2000-08-23	<rlk@sourceforge.net>
 
+	Files:	Ghost/gdevstp.c (1.35) (+3 -3)
+
+	Fix page positioning, from Wolfgang Fritz
+
+2000-08-23	<rlk@sourceforge.net>
+
 	Files:	gimp_main_window.c (1.41) (+103 -103)
 
 	Tweak the UI a bit more
@@ -22558,6 +30085,12 @@
 
 2000-08-20	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.35) (+13 -9)
+
+	Minor cleanup
+
+2000-08-20	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.215) (+13 -13)
 
 	Enable 180 DPI mode for some Epson printers.  This mode is useless on
@@ -22590,10 +30123,32 @@
 
 	Fix debug code (likewise)
 
+2000-08-19	<rlk@sourceforge.net>
+
+	Files:	README.new-printer (1.1) (added)
+
+	Instructions for adding/tuning printers.
+
+2000-08-15	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.31) (+17 -0)
+
+	4.0a2
+
+2000-08-15	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.19) (+14 -1)
+
+	Last minute changes.
+
 2000-08-15	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.50) (+1 -1)
+	Files:	ChangeLog (1.30) (+156 -0)
+		Ghost/README (1.34) (+10 -2)
+		Makefile.am (1.50) (+1 -1)
 		README (1.23) (+1 -1)
+		RELNOTES (1.18) (+24 -2)
+		configure.in (1.24) (+1 -1)
 
 	Prep for 4.0a2
 
@@ -22625,6 +30180,19 @@
 	Make ink type selection even more data driven, rather than logic
 	driven.
 
+2000-08-14	<rlk@sourceforge.net>
+
+	Files:	cyan-sweep.tif (1.1) (added)
+
+	cyan sweep pattern for testing
+
+2000-08-13	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.34) (+8 -4)
+		Ghost/gdevstp.h (1.4) (removed)
+
+	No good reason to have a trivial header file for a one file driver
+
 2000-08-13	<rlk@sourceforge.net>
 
 	Files:	print-dither.c (1.79) (+3 -3)
@@ -22667,11 +30235,20 @@
 
 2000-08-12	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.36) (+25 -13)
+	Files:	run-weavetest (1.18) (+1 -1)
+
+	Actually test the other required modes!
+
+2000-08-12	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.33) (+19 -9)
+		Ghost/gdevstp.c (1.33) (+37 -27)
+		gimp_main_window.c (1.36) (+25 -13)
 		gtk_main_window.c (1.45) (+22 -10)
 		print-dither.c (1.77) (+31 -16)
 		print-escp2.c (1.208) (+221 -139)
 		print-util.c (1.113) (+5 -5)
+		run-weavetest (1.17) (+1 -1)
 
 	Fix PPI rescale when image is changed from portrait to landscape mode.
 
@@ -22722,8 +30299,18 @@
 
 2000-08-09	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.49) (+20 -10)
+	Files:	ChangeLog (1.29) (+18 -0)
+
+	4.0a1 release
+
+2000-08-09	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.28) (+98 -0)
+		Ghost/README (1.32) (+6 -6)
+		Makefile.am (1.49) (+20 -10)
 		README (1.22) (+1 -1)
+		RELNOTES (1.17) (+38 -16)
+		configure.in (1.23) (+1 -1)
 		print-canon.c (1.72) (+4 -4)
 		print-escp2.c (1.206) (+2 -2)
 		print-pcl.c (1.69) (+2 -2)
@@ -22740,6 +30327,13 @@
 
 	More minor tuning
 
+2000-08-09	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.32) (+12 -3)
+
+	Try yet again to solve the problem of printing only half the page in
+	the GS driver.
+
 2000-08-08	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.204) (+7 -7)
@@ -22755,6 +30349,7 @@
 2000-08-08	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.203) (+265 -90)
+		printers.xml (1.20) (+30 -30)
 
 	Use tables to generate dot size and density information rather than
 	heuristics.  This makes it possible to pick optimum dot size for each
@@ -22770,7 +30365,21 @@
 
 2000-08-06	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.71) (+2 -20)
+	Files:	Ghost/.cvsignore (1.4) (+5 -1)
+
+	update cvsignore
+
+2000-08-06	<rlk@sourceforge.net>
+
+	Files:	cups/.cvsignore (1.1) (added)
+
+	cvsignore
+
+2000-08-06	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.31) (+2 -2)
+		Ghost/gdevstp.c (1.31) (+148 -179)
+		print-canon.c (1.71) (+2 -20)
 		print-escp2.c (1.202) (+4 -4)
 		print-image-gimp.c (1.6) (+8 -2)
 		print-pcl.c (1.68) (+2 -1)
@@ -22783,21 +30392,43 @@
 
 2000-08-06	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.46) (+19 -5)
+	Files:	ChangeLog (1.27) (+297 -0)
+		Makefile.am (1.46) (+19 -5)
 		README (1.21) (+12 -2)
+		RELNOTES (1.16) (+48 -16)
+		configure.in (1.22) (+4 -1)
 		print_gimp.h (1.24) (+2 -2)
 
 	Start preparations for release.
 
 2000-08-06	<rlk@sourceforge.net>
 
+	Files:	Ghost/gdevstp.c (1.30) (+29 -31)
+
+	gs_param_strings are counted strings, not null-delimited.
+
+2000-08-06	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.30) (+2 -2)
+
+	Fix dither algorithm names
+
+2000-08-06	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.201) (+2 -2)
 
 	Fix for the 640.
 
 2000-08-05	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.45) (+1 -1)
+	Files:	Ghost/README (1.29) (+274 -91)
+		Ghost/com-stp.ppd (1.3) (+69 -18)
+		Ghost/contrib.mak.addon (1.8) (+18 -6)
+		Ghost/devs.mak.addon-5.10 (1.3) (+17 -5)
+		Ghost/gdevstp.c (1.29) (+169 -134)
+		Ghost/gs-stp.pdq (1.7) (+286 -71)
+		Makefile.am (1.45) (+1 -1)
+		README.escp2 (1.12) (+1 -1)
 		gimp_main_window.c (1.35) (+4 -5)
 		gtk_main_window.c (1.44) (+4 -5)
 		print-canon.c (1.70) (+107 -24)
@@ -22808,23 +30439,19 @@
 		print.c (1.105) (+13 -4)
 		print.h (1.72) (+41 -33)
 		printdefy.y (1.7) (+12 -1)
+		printers.xml (1.19) (+52 -12)
 
 	Major revamp to the Ghostscript driver.  This allows use of all supported
 	printers (not just Epson) with the stp driver.  Also, many of the options
 	have changed incompatibly.  This change was required in order to better
 	support the driver in the long run.
 
-2000-08-05	<rlk@sourceforge.net>
+2000-08-05	<sharkey@sourceforge.net>
 
-	Files:	print-canon.c (1.69.2.5) (+13 -14)
-		print-escp2.c (1.198.2.5) (+13 -14)
-		print-pcl.c (1.66.2.4) (+9 -22)
-		print-ps.c (1.36.2.4) (+13 -30)
-		print-util.c (1.111.2.3) (+30 -12)
-		print.h (1.71.2.4) (+17 -21)
-		printdefy.y (1.6.2.4) (+8 -5)
+	Files:	Ghost/devs.mak.addon-5.10 (1.2) (+4 -0)
 
-	Fix the last remaining bugs in the Ghostscript driver revamp.
+	The main branch ghostscript also needs the addition of gdevstp-weave in
+	order to make properly.
 
 2000-08-05	<rlk@sourceforge.net>
 
@@ -22833,50 +30460,6 @@
 	The ESC 640 claims to use the new command set, and also claims to be a
 	1440 dpi printer, but it doesn't support the ESC($ command???
 
-2000-08-05	<rlk@sourceforge.net>
-
-	Files:	gimp_main_window.c (1.34.2.1) (+4 -5)
-		gtk_main_window.c (1.43.2.1) (+4 -5)
-		print-canon.c (1.69.2.4) (+41 -24)
-		print-escp2.c (1.198.2.4) (+19 -8)
-		print-pcl.c (1.66.2.3) (+36 -7)
-		print-ps.c (1.36.2.3) (+39 -10)
-		print-util.c (1.111.2.2) (+29 -9)
-		print.c (1.104.2.2) (+9 -3)
-		print.h (1.71.2.3) (+35 -20)
-		printdefy.y (1.6.2.3) (+5 -1)
-
-	Set page dimensions correctly (?) in Ghostscript
-
-2000-08-05	<rlk@sourceforge.net>
-
-	Files:	print-canon.c (1.69.2.3) (+3 -7)
-		print-escp2.c (1.198.2.3) (+3 -7)
-		print-pcl.c (1.66.2.2) (+3 -6)
-		print-ps.c (1.36.2.2) (+2 -2)
-		print-util.c (1.111.2.1) (+105 -1)
-		print.c (1.104.2.1) (+6 -3)
-		print.h (1.71.2.2) (+12 -7)
-		printdefy.y (1.6.2.2) (+5 -5)
-
-	Check consistency of print variables before printing.
-
-	Change resolution and dither algorithm to strings rather than numbers.
-
-2000-08-04	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.198.2.2) (+71 -24)
-
-	Support more paper types.
-
-	Split out Stylus Photo 670.
-
-2000-08-04	<rlk@sourceforge.net>
-
-	Files:	print-canon.c (1.69.2.2) (+43 -1)
-
-	#ifdef out the stderr noise
-
 2000-08-04	<rlk@sourceforge.net>
 
 	Files:	escputil.c (1.7) (+49 -18)
@@ -22886,23 +30469,6 @@
 
 	Attempt to function on systems without GNU getopt.
 
-2000-08-03	<rlk@sourceforge.net>
-
-	Files:	escputil.c (1.6.2.1) (+2 -2)
-
-	We need to open the raw device write only, not read only.
-
-2000-08-03	<rlk@sourceforge.net>
-
-	Files:	print-canon.c (1.69.2.1) (+30 -1)
-		print-escp2.c (1.198.2.1) (+1 -3)
-		print-pcl.c (1.66.2.1) (+10 -1)
-		print-ps.c (1.36.2.1) (+6 -1)
-		print.h (1.71.2.1) (+7 -15)
-		printdefy.y (1.6.2.1) (+5 -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)
@@ -22987,12 +30553,19 @@
 
 	print-weave.c needs to go into Ghostscript driver
 
+2000-08-01	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.7) (+4 -0)
+
+	print-weave.c
+
 2000-07-31	<cpbs@sourceforge.net>
 
 	Files:	Makefile.am (1.43) (+1 -0)
+		README.weave (1.1) (added)
 		escp2-weavetest.c (1.14) (+10 -18)
 		print-escp2.c (1.193) (+85 -309)
-		print-weave.c (1.1) ( )
+		print-weave.c (1.1) (added)
 		print.h (1.70) (+12 -2)
 
 	New weave algorithm.  The softweave calculations are now done in
@@ -23001,6 +30574,22 @@
 	to the test code in escp2-weavetest.c.  Declarations added to print.h.
 	Unfinished documentation for the algorithm is in README.weave.
 
+2000-07-31	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.11) (+35 -25)
+
+	Update some of the remote mode stuff
+
+2000-07-31	<easysw@sourceforge.net>
+
+	Files:	cups/README.txt (1.2) (+80 -57)
+		cups/dither.c (1.2) (+17 -10)
+		cups/rastertoepson.c (1.3) (+10 -4)
+
+	Updated README a little bit.
+
+	Some changes to the dithering code to get the density stuff to work right.
+
 2000-07-30	<cpbs@sourceforge.net>
 
 	Files:	print-image-gimp.c (1.5) (+5 -6)
@@ -23014,9 +30603,43 @@
 
 	More constant tuning
 
+2000-07-30	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.3) (+25 -6)
+		cups/check.c (1.1) (added)
+		cups/dither.c (1.1) (added)
+		cups/epson.drv (1.2) (+111 -188)
+		cups/pack.c (1.1) (added)
+		cups/rastertoepson.c (1.2) (+884 -165)
+		cups/util.h (1.1) (added)
+
+	First working version of CUPS driver using gimp-print dithering.
+
+2000-07-25	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.28) (+11 -2)
+
+	Additional instructions for installing Ghostscript driver from Matti
+	Ahokas <mattiaho@solutions.fi>.
+
+2000-07-24	<cpbs@sourceforge.net>
+
+	Files:	debian/.cvsignore (1.1) (added)
+
+	*** empty log message ***
+
+2000-07-23	<rlk@sourceforge.net>
+
+	Files:	README.dither (1.7) (+8 -6)
+
+	Clarify some wording.
+
 2000-07-23	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.75) (+4 -4)
+	Files:	Ghost/README (1.27) (+4 -4)
+		Ghost/com-stp.ppd (1.2) (+4 -4)
+		Ghost/gs-stp.pdq (1.6) (+4 -4)
+		print-dither.c (1.75) (+4 -4)
 
 	Make adaptive hybrid be the default dither algorithm
 
@@ -23042,7 +30665,8 @@
 
 2000-07-21	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.32) (+46 -10)
+	Files:	ChangeLog (1.26) (+10 -0)
+		gimp_main_window.c (1.32) (+46 -10)
 		gtk_main_window.c (1.41) (+47 -10)
 		print-dither.c (1.74) (+3 -3)
 
@@ -23056,7 +30680,8 @@
 
 2000-07-20	<cpbs@sourceforge.net>
 
-	Files:	print-escp2.c (1.191) (+93 -46)
+	Files:	README.escp2 (1.10) (+120 -20)
+		print-escp2.c (1.191) (+93 -46)
 
 	Add support for zero-margin mode on the STP 870 and 1270.  Add some more
 	info gleaned about remote mode commands.
@@ -23093,14 +30718,18 @@
 
 2000-07-18	<rlk@sourceforge.net>
 
-	Files:	README (1.20) (+34 -5)
+	Files:	ChangeLog (1.25) (+18 -0)
+		README (1.20) (+34 -5)
+		RELNOTES (1.15) (+26 -1)
+		configure.in (1.21) (+1 -1)
 		print_gimp.h (1.23) (+2 -2)
 
 	3.1.9 release
 
 2000-07-18	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.11) (+37 -9)
+	Files:	ChangeLog (1.24) (+85 -0)
+		gimp_color_window.c (1.11) (+37 -9)
 		gimp_main_window.c (1.31) (+4 -35)
 		gtk_color_window.c (1.14) (+38 -9)
 		gtk_main_window.c (1.40) (+2 -34)
@@ -23137,6 +30766,20 @@
 
 	More minor tweaks
 
+2000-07-14	<cpbs@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.28) (+23 -21)
+
+	New function, get_escp2_printer_by_model().  Use it in stp_print_page()
+	and stp_open().  stp_open() previously used get_printer_by_index()
+	which can't have been right.
+
+2000-07-14	<rlk@sourceforge.net>
+
+	Files:	README.dither (1.6) (+42 -110)
+
+	Some updates.
+
 2000-07-14	<rlk@sourceforge.net>
 
 	Files:	print-dither.c (1.71) (+2 -2)
@@ -23174,6 +30817,18 @@
 
 	4) Switch back to linear transition for black.
 
+2000-07-13	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.9) (+25 -0)
+
+	(slightly) More info on remote mode.
+
+2000-07-12	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.23) (+12 -0)
+
+	3.1.8 redo
+
 2000-07-12	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.42) (+1 -1)
@@ -23182,12 +30837,44 @@
 
 2000-07-12	<rlk@sourceforge.net>
 
-	Files:	README (1.19) (+1 -1)
+	Files:	ChangeLog (1.22) (+13 -0)
+
+	3.1.8 release
+
+2000-07-12	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.21) (+265 -0)
+		Ghost/README (1.26) (+21 -5)
+		Ghost/gdevstp.c (1.27) (+34 -19)
+		README (1.19) (+1 -1)
+		RELNOTES (1.14) (+52 -1)
+		configure.in (1.20) (+1 -1)
 		print-escp2.c (1.182) (+1 -4)
 		print_gimp.h (1.22) (+2 -2)
 
 	Allow choice of ink type in Ghostscript driver
 
+2000-07-11	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.26) (+6 -3)
+
+	Pass the correct arguments to escp2_imageable_area (from Ed Hynan,
+	ehy@delphi.com).
+
+2000-07-10	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.25) (+1 -1)
+
+	Document saturation may be zero
+
+2000-07-10	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.25) (+2 -2)
+
+	Allow saturation of 0.
+
+	Still need to do ink type
+
 2000-07-10	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.181) (+2 -2)
@@ -23221,6 +30908,7 @@
 2000-07-04	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.64) (+41 -15)
+		printers.xml (1.18) (+9 -1)
 
 	Split the 540C out from the 500C as it supports more paper sizes
 	including custom paper sizes.
@@ -23262,7 +30950,11 @@
 
 2000-06-30	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.178) (+166 -79)
+	Files:	Ghost/README (1.24) (+13 -8)
+		Ghost/gdevstp.c (1.24) (+2 -2)
+		README.escp2 (1.8) (+3 -3)
+		print-escp2.c (1.178) (+166 -79)
+		printers.xml (1.17) (+64 -16)
 
 	Nominally support large paper sizes on many printers.
 
@@ -23274,7 +30966,11 @@
 
 2000-06-30	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.176) (+10 -3)
+	Files:	Ghost/README (1.23) (+1 -0)
+		Ghost/gdevstp.c (1.23) (+2 -2)
+		print-escp2.c (1.176) (+10 -3)
+		printers.xml (1.16) (+8 -0)
+		run-weavetest (1.16) (+2 -2)
 
 	Epson Stylus 480 (non-US model).  Very strange printer, with 15 jets.
 	Presumably separation of 8.
@@ -23284,7 +30980,10 @@
 
 2000-06-30	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.175) (+8 -1)
+	Files:	Ghost/README (1.22) (+3 -0)
+		Ghost/gdevstp.c (1.22) (+2 -2)
+		print-escp2.c (1.175) (+8 -1)
+		printers.xml (1.15) (+8 -0)
 
 	Support for Epson Stylus Photo 720 (overseas model)
 
@@ -23309,20 +31008,10 @@
 
 	Declare yylex() to clean up a pesky compiler warning.
 
-2000-06-29	<jmv@sourceforge.net>
-
-	Files:	print-canon.c (1.49.2.5) (+1 -1)
-		print-dither.c (1.53.2.8) (+50 -49)
-		print-escp2.c (1.155.2.7) (+92 -72)
-		print-pcl.c (1.52.2.5) (+1 -1)
-		print.h (1.55.2.6) (+2 -2)
-
-	Ink reduction is back in. Improved levels for better transitions.
-	Cleanup.
-
 2000-06-26	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.67) (+11 -1)
+		printers.xml (1.14) (+8 -0)
 
 	Added model "BJC 4400 photo" from a patch by Alex Butcher
 
@@ -23366,6 +31055,18 @@
 
 	Rename some variables for clarity
 
+2000-06-24	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.7) (+6 -1)
+
+	Minor update
+
+2000-06-24	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.6) (+103 -16)
+
+	Update with commands documented in the Stylus Pro 9000 manual
+
 2000-06-24	<gandy@sourceforge.net>
 
 	Files:	print.c (1.102) (+18 -14)
@@ -23391,14 +31092,6 @@
 	Preparations to improve color output on the canon printers (might break
 	things till the next commit)
 
-2000-06-23	<jmv@sourceforge.net>
-
-	Files:	print-dither.c (1.53.2.7) (+70 -63)
-		print-escp2.c (1.155.2.6) (+71 -69)
-		print.h (1.55.2.5) (+2 -0)
-
-	Several corrections. Black improved. Ordered dithering massively improved
-
 2000-06-22	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.63) (+3 -1)
@@ -23419,7 +31112,8 @@
 
 2000-06-22	<gandy@sourceforge.net>
 
-	Files:	print-canon.c (1.62) (+23 -8)
+	Files:	ChangeLog (1.20) (+333 -0)
+		print-canon.c (1.62) (+23 -8)
 
 	* Added new command for the bjc-8200
 	* Changed order of colors to KYMCymc (hope this fixes problem with the bjc-8200)
@@ -23427,10 +31121,12 @@
 
 2000-06-22	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.26) (+5 -4)
+	Files:	Ghost/README (1.21) (+26 -11)
+		gimp_main_window.c (1.26) (+5 -4)
 		gtk_main_window.c (1.34) (+4 -3)
 		print-dither.c (1.67) (+2 -2)
 		print-escp2.c (1.170) (+5 -5)
+		run-weavetest (1.15) (+1 -1)
 
 	New emulated 1440x2880 oversampled mode -- very slow, extremely smooth,
 	no visible banding at all.
@@ -23453,6 +31149,25 @@
 
 2000-06-21	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.20) (+55 -42)
+
+	Update
+
+2000-06-21	<rlk@sourceforge.net>
+
+	Files:	Ghost/gdevstp.c (1.21) (+3 -2)
+
+	New application gamma
+
+2000-06-21	<khk@sourceforge.net>
+
+	Files:	Ghost/README (1.19) (+3 -3)
+
+	Corrected examples in README: The PostScript file has to be the last
+	parameter on the command line.
+
+2000-06-21	<rlk@sourceforge.net>
+
 	Files:	gimp_main_window.c (1.24) (+122 -51)
 		gtk_main_window.c (1.32) (+22 -24)
 		print_gimp.h (1.21) (+1 -2)
@@ -23461,7 +31176,8 @@
 
 2000-06-21	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.61) (+4 -3)
+	Files:	Ghost/gdevstp.c (1.20) (+2 -2)
+		print-canon.c (1.61) (+4 -3)
 		print-escp2.c (1.169) (+12 -10)
 		print-pcl.c (1.61) (+3 -5)
 		print-ps.c (1.34) (+3 -3)
@@ -23475,7 +31191,8 @@
 
 2000-06-20	<cpbs@sourceforge.net>
 
-	Files:	print-image-gimp.c (1.3) (+16 -42)
+	Files:	Ghost/gdevstp.c (1.19) (+1 -7)
+		print-image-gimp.c (1.3) (+16 -42)
 		print.h (1.65) (+3 -3)
 
 	Remove Image_get_col() which is no longer used.  Split out Image_reset()
@@ -23525,7 +31242,8 @@
 
 2000-06-20	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.23) (+2 -2)
+	Files:	Ghost/gdevstp.c (1.18) (+6 -3)
+		gimp_main_window.c (1.23) (+2 -2)
 		gtk_main_window.c (1.28) (+2 -2)
 		print-canon.c (1.59) (+2 -2)
 		print-escp2.c (1.167) (+2 -2)
@@ -23542,20 +31260,6 @@
 
 	Declare main() properly.
 
-2000-06-20	<jmv@sourceforge.net>
-
-	Files:	gimp_color_window.c (1.6.2.2) (+2 -2)
-		gimp_main_window.c (1.10.2.3) (+101 -28)
-		gtk_color_window.c (1.9.2.2) (+2 -2)
-		gtk_main_window.c (1.14.2.3) (+83 -17)
-		print-dither.c (1.53.2.6) (+21 -16)
-		print-escp2.c (1.155.2.5) (+48 -18)
-		print.c (1.95.2.3) (+18 -9)
-		print.h (1.55.2.4) (+1 -0)
-
-	Fixes several bugs for 1 ink level and 3 ink level printers.
-	Changes to black generation.
-
 2000-06-20	<rlk@sourceforge.net>
 
 	Files:	gimp_main_window.c (1.22) (+6 -4)
@@ -23569,6 +31273,12 @@
 
 2000-06-19	<rlk@sourceforge.net>
 
+	Files:	Ghost/.cvsignore (1.3) (+2 -3)
+
+	Add rectangular dither matrix.
+
+2000-06-19	<rlk@sourceforge.net>
+
 	Files:	.cvsignore (1.8) (+1 -0)
 
 	Add escputil
@@ -23618,6 +31328,7 @@
 2000-06-19	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.58) (+12 -2)
+		printers.xml (1.13) (+8 -0)
 
 	Added Canon BJC-4300
 
@@ -23633,9 +31344,76 @@
 
 	Included Unit (Inch/Cm) checkboxes
 
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/commandtoepson.c (1.4) (+31 -4)
+
+	Eject page after test commands...
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/Makefile.in (1.2) (+3 -3)
+		cups/commandtoepson.c (1.3) (+3 -3)
+
+	Makefile error and typo in commandtoepson.
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/commands/CleanAll.cmd (1.1) (added)
+		cups/commands/PrintAligmentPage.cmd (1.1) (added)
+		cups/commands/PrintSelfTestPage.cmd (1.1) (added)
+		cups/commands/ReportLevels.cmd (1.1) (added)
+		cups/commands/SetAlignment.cmd (1.1) (added)
+
+	Added sample command files.
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/epson.c (1.3) (+18 -173)
+
+	Only report bidirectional parallel ports, to avoid potential port lockup
+	problems.
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/CHANGES.txt (1.1) (added)
+		cups/command.txt (1.1) (added)
+		cups/command.types (1.1) (added)
+		cups/commandtoepson.c (1.2) (+108 -4)
+		cups/epson.c (1.2) (+89 -24)
+
+	EPSON command filter.
+
+	First specification for command files.
+
+	EPSON backend now reads back Ink Quantity levels.
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/README.txt (1.1) (added)
+
+	Added README file...
+
+2000-06-18	<easysw@sourceforge.net>
+
+	Files:	cups/LICENSE.txt (1.1) (added)
+		cups/Makefile.in (1.1) (added)
+		cups/calibrate.c (1.1) (added)
+		cups/calibrate.ppm (1.1) (added)
+		cups/commandtoepson.c (1.1) (added)
+		cups/configure (1.1) (added)
+		cups/configure.in (1.1) (added)
+		cups/epson.c (1.1) (added)
+		cups/epson.drv (1.1) (added)
+		cups/genppd.c (1.1) (added)
+		cups/rastertoepson.c (1.1) (added)
+
+	Initial commit of CUPS driver files.
+
 2000-06-18	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.40) (+5 -7)
+	Files:	ChangeLog (1.19) (+28 -0)
+		Makefile.am (1.40) (+5 -7)
 		gimp_main_window.c (1.19) (+36 -22)
 		gtk_main_window.c (1.23) (+31 -20)
 		print-canon.c (1.57) (+5 -7)
@@ -23643,7 +31421,7 @@
 		print-escp2.c (1.166) (+5 -6)
 		print-pcl.c (1.58) (+5 -7)
 		print.h (1.61) (+4 -5)
-		ran.367.179.h (1.1) ( )
+		ran.367.179.h (1.1) (added)
 
 	Incorporate Thomas Tonino's 367x192 matrix.
 
@@ -23657,41 +31435,52 @@
 
 	Minor bug fix
 
-2000-06-18	<jmv@sourceforge.net>
-
-	Files:	escp2-unprint.c (1.1.6.1) (+8 -8)
-		escp2-weavetest.c (1.11.2.1) (+2 -2)
-		gimp_color_window.c (1.6.2.1) (+2 -2)
-		gimp_main_window.c (1.10.2.2) (+19 -19)
-		gtk_color_window.c (1.9.2.1) (+7 -7)
-		gtk_main_window.c (1.14.2.2) (+57 -47)
-		pcl-unprint.c (1.12.2.1) (+11 -11)
-		print-canon.c (1.49.2.4) (+138 -138)
-		print-dither.c (1.53.2.5) (+181 -162)
-		print-escp2.c (1.155.2.4) (+437 -234)
-		print-image-gimp.c (1.2.2.2) (+3 -3)
-		print-pcl.c (1.52.2.4) (+61 -61)
-		print-ps.c (1.26.2.2) (+2 -2)
-		print-util.c (1.92.2.2) (+5 -5)
-		print.c (1.95.2.2) (+6 -6)
-		print.h (1.55.2.3) (+3 -3)
-		print_gimp.h (1.15.2.2) (+0 -0)
-		quickmatrix199-2.h (1.1.2.1) (+3466 -3466)
-		quickmatrix199.h (1.1.2.1) (+3466 -3466)
-		quickmatrix257.h (1.1.2.1) (+5951 -5951)
-		unprint.c (1.37.6.2) (+44 -44)
-
-	Merge with 2000-06-17 main repository. gtk "Driver" now shows all printers
+2000-06-18	<ttonino@sourceforge.net>
+
+	Files:	Matgen/ran.367.179.h (1.1) (added)
+
+	Test matrix for 2:1 resolutions
+
+2000-06-18	<rlk@sourceforge.net>
+
+	Files:	Matgen/quickmatrix199-2.i (1.2) (removed)
+		Matgen/quickmatrix199.i (1.2) (removed)
+		Matgen/quickmatrix257.i (1.2) (removed)
+
+	These files already exist at top level; no reason to have duplicates
+	in every sandbox.
 
 2000-06-18	<rlk@sourceforge.net>
 
-	Files:	README (1.18) (+1 -1)
+	Files:	printers.xml (1.12) (+4 -52)
+
+	Reduce the number of printers to slightly mitigate the excessive menu
+	length.
+
+2000-06-18	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.18) (+12 -0)
+		README (1.18) (+1 -1)
+		RELNOTES (1.13) (+7 -1)
+		configure.in (1.19) (+1 -1)
 		print_gimp.h (1.20) (+2 -2)
 
 	Print 3.1.7 release
 
 2000-06-18	<rlk@sourceforge.net>
 
+	Files:	Ghost/gdevstp.c (1.17) (+2 -2)
+
+	Fix really stupid bug.  Need to do a flash 3.1.7.
+
+2000-06-18	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.5) (+9 -0)
+
+	Add a few more remote mode commands
+
+2000-06-18	<rlk@sourceforge.net>
+
 	Files:	escputil.c (1.2) (+207 -37)
 
 	Add ink levels and ID string
@@ -23704,13 +31493,41 @@
 
 2000-06-17	<rlk@sourceforge.net>
 
-	Files:	README (1.17) (+1 -1)
+	Files:	ChangeLog (1.17) (+49 -0)
+
+	3.1.6 release point
+
+2000-06-17	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.16) (+71 -0)
+		README (1.17) (+1 -1)
+		RELNOTES (1.12) (+35 -1)
+		configure.in (1.18) (+1 -1)
 		print_gimp.h (1.18) (+2 -2)
+		run-weavetest (1.14) (+1 -1)
 
 	3.1.6 release prep
 
 2000-06-17	<rlk@sourceforge.net>
 
+	Files:	Ghost/gs-stp.pdq (1.5) (+421 -291)
+
+	Update from Grant Taylor's PDQ-o-matic script
+
+2000-06-17	<rlk@sourceforge.net>
+
+	Files:	Ghost/com-stp.ppd (1.1) (added)
+
+	PPD file, from Grant Taylor's CUPS-O-MATIC program
+
+2000-06-17	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.18) (+4 -2)
+
+	Note the existence of the CUPS .ppd file.
+
+2000-06-17	<rlk@sourceforge.net>
+
 	Files:	Makefile.am (1.39) (+11 -10)
 
 	Do not distribute the 199-axis matrices, since we're not currently
@@ -23718,43 +31535,42 @@
 
 2000-06-17	<rlk@sourceforge.net>
 
-	Files:	escputil.c (1.1) ( )
+	Files:	escputil.c (1.1) (added)
 
 	ESCP/2 print head clean, nozzle check, alignment utility.
 
 2000-06-17	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.49.2.3) (+2 -2)
-		print-pcl.c (1.52.2.3) (+2 -2)
+	Files:	README.escp2 (1.4) (+9 -4)
+
+	Better explanation of alignment check/set commands.
+
+2000-06-17	<rlk@sourceforge.net>
 
-	Fix calls to dither_set_density
+	Files:	Ghost/gdevstp.c (1.16) (+22 -2)
 
-2000-06-17	<jmv@sourceforge.net>
+	Handle -r1440x720 correctly.
 
-	Files:	gimp_main_window.c (1.10.2.1) (+168 -121)
-		gtk_main_window.c (1.14.2.1) (+182 -118)
-		print-canon.c (1.49.2.2) (+95 -268)
-		print-dither.c (1.53.2.4) (+1 -8)
-		print-image-gimp.c (1.2.2.1) (+1 -1)
-		print-pcl.c (1.52.2.2) (+98 -335)
-		print-ps.c (1.26.2.1) (+20 -159)
-		print.c (1.95.2.1) (+12 -87)
-		print_gimp.h (1.15.2.1) (+9 -1)
-		unprint.c (1.37.6.1) (+2 -2)
+2000-06-17	<iay@sourceforge.net>
 
-	Branch cleanup
+	Files:	README.escp2 (1.3) (+92 -8)
 
-2000-06-17	<jmv@sourceforge.net>
+	Added information about remote mode commands gleaned from examination of
+	the output of the Epson utilities for the ESC740.
 
-	Files:	print-dither.c (1.53.2.3) (+120 -99)
-		print-escp2.c (1.155.2.3) (+21 -21)
-		print-util.c (1.92.2.1) (+134 -2)
+2000-06-15	<sharkey@sourceforge.net>
 
-	Density based dithering. Improved black generation and color transitions
+	Files:	make-deb.sh (1.2) (+1 -1)
+
+	Zheesh.  I thought I committed this weeks ago...
+
+	Modify the gs debian package build script to work as a non-root user by
+	using the fakeroot package.
 
 2000-06-15	<rlk@sourceforge.net>
 
-	Files:	escp2-unprint.c (1.2) (+8 -8)
+	Files:	Ghost/gdevstp.c (1.15) (+24 -24)
+		escp2-unprint.c (1.2) (+8 -8)
 		escp2-weavetest.c (1.12) (+2 -2)
 		gimp_color_window.c (1.7) (+2 -2)
 		gimp_main_window.c (1.18) (+19 -19)
@@ -23797,27 +31613,10 @@
 	Scale quadratically rather than linearly between tones to improve
 	transition regions on 6-color and variable dot size printers.
 
-2000-06-13	<jmv@sourceforge.net>
-
-	Files:	print.h (1.55.2.2) (+25 -6)
-
-	JMV's work updated
-
-2000-06-13	<jmv@sourceforge.net>
-
-	Files:	print-escp2.c (1.155.2.2) (+335 -344)
-
-	JMV's work for epson 870
-
-2000-06-13	<jmv@sourceforge.net>
-
-	Files:	print-dither.c (1.53.2.2) (+786 -551)
-
-	JMV's Work based on print-dither 1.60
-
 2000-06-13	<rlk@sourceforge.net>
 
-	Files:	print-image-gimp.c (1.2) (+3 -3)
+	Files:	ChangeLog (1.15) (+86 -0)
+		print-image-gimp.c (1.2) (+3 -3)
 		print-ps.c (1.31) (+2 -2)
 		print.h (1.60) (+3 -3)
 
@@ -23840,13 +31639,6 @@
 	or take.  Photographs will not improve very much in rendering
 	performance.
 
-2000-06-13	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.60.2.1) (+55 -37)
-		print-escp2.c (1.161.2.1) (+386 -193)
-
-	In case I have a disk crash...
-
 2000-06-12	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.55) (+25 -21)
@@ -23858,6 +31650,13 @@
 
 2000-06-12	<cpbs@sourceforge.net>
 
+	Files:	Ghost/gdevstp.c (1.14) (+6 -1)
+
+	Added untested support for the new Image interface by adding
+	Image_rotate_ccw() stub function.
+
+2000-06-12	<cpbs@sourceforge.net>
+
 	Files:	print-canon.c (1.54) (+63 -132)
 		print-escp2.c (1.161) (+49 -110)
 		print-pcl.c (1.56) (+90 -206)
@@ -23878,7 +31677,7 @@
 2000-06-12	<cpbs@sourceforge.net>
 
 	Files:	Makefile.am (1.38) (+1 -0)
-		print-image-gimp.c (1.1) ( )
+		print-image-gimp.c (1.1) (added)
 		print.c (1.97) (+5 -85)
 		print.h (1.58) (+16 -6)
 		print_gimp.h (1.17) (+8 -1)
@@ -23897,10 +31696,23 @@
 
 2000-06-10	<rlk@sourceforge.net>
 
+	Files:	print-ps.c (1.29) (+10 -132)
+
+	Factor out common code
+
+2000-06-10	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.14) (+1259 -1196)
+		mkchlog (1.3) (+17 -7)
+
+	Note the lines added/removed in the change long (helps identify
+	major changes).
+
+2000-06-10	<rlk@sourceforge.net>
+
 	Files:	print-canon.c (1.53) (+10 -123)
 		print-escp2.c (1.160) (+17 -144)
 		print-pcl.c (1.55) (+8 -134)
-		print-ps.c (1.29) (+10 -132)
 		print-util.c (1.93) (+161 -1)
 		print.h (1.57) (+9 -2)
 
@@ -23951,12 +31763,30 @@
 
 2000-06-09	<rlk@sourceforge.net>
 
+	Files:	Ghost/gs-stp.pdq (1.4) (+3 -8)
+
+	Minor corrections
+
+2000-06-09	<rlk@sourceforge.net>
+
 	Files:	Makefile.am (1.37) (+1 -1)
 
 	Add description of ESCP2 language
 
 2000-06-08	<rlk@sourceforge.net>
 
+	Files:	README.escp2 (1.2) (+41 -1)
+
+	Command sequences
+
+2000-06-08	<rlk@sourceforge.net>
+
+	Files:	README.escp2 (1.1) (added)
+
+	Summary of ESCP/2 raster commands
+
+2000-06-08	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.158) (+71 -17)
 
 	Update description of softweave.
@@ -24096,13 +31926,9 @@
 
 2000-06-03	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.49.2.1) (+2 -2)
-		print-dither.c (1.53.2.1) (+101 -51)
-		print-escp2.c (1.155.2.1) (+31 -9)
-		print-pcl.c (1.52.2.1) (+2 -2)
-		print.h (1.55.2.1) (+3 -3)
+	Files:	Ghost/README (1.17) (+2 -2)
 
-	Put Jean-Marc Verbavatz's stuff on a branch, to make merging easier
+	Note ESP 870/1270
 
 2000-06-02	<rlk@sourceforge.net>
 
@@ -24110,14 +31936,48 @@
 
 	Advance paper correctly initially in microweave/360 modes.
 
+2000-06-01	<jmv@sourceforge.net>
+
+	Files:	jmv/print-escp2.c (1.31) (+1 -1)
+
+	Minor fixes
+
+2000-06-01	<jmv@sourceforge.net>
+
+	Files:	jmv/print-dither.c (1.31) (+20 -55)
+
+	Minor update against print-dither 1.53
+
 2000-06-01	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.53) (+130 -13)
+	Files:	ChangeLog (1.13) (+4200 -0)
+		Ghost/README (1.16) (+0 -1)
+		print-dither.c (1.53) (+130 -13)
 		print-escp2.c (1.154) (+62 -1)
 		print.h (1.55) (+25 -3)
 
 	Merge Jean-Marc's new functions in, without touching the core
 
+2000-06-01	<jmv@sourceforge.net>
+
+	Files:	jmv/README (1.2) (+6 -0)
+		jmv/print.h (1.2) (+39 -36)
+
+	*** empty log message ***
+
+2000-05-31	<jmv@sourceforge.net>
+
+	Files:	jmv/print-dither.c (1.3) (+288 -272)
+		jmv/print-escp2.c (1.3) (+122 -162)
+
+	Merge with ttonino's work
+
+2000-05-31	<rlk@sourceforge.net>
+
+	Files:	printers.xml (1.11) (+7 -0)
+
+	Lexmark 4076 apparently works, as an HP 500C.
+
 2000-05-31	<rlk@sourceforge.net>
 
 	Files:	print-dither.c (1.52) (+2 -55)
@@ -24126,7 +31986,10 @@
 
 2000-05-31	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.36) (+4 -1)
+	Files:	ChangeLog (1.12) (+0 -4126)
+		Makefile.am (1.36) (+4 -1)
+		RELNOTES (1.11) (+37 -1)
+		configure.in (1.17) (+2 -2)
 		print_gimp.h (1.15) (+2 -2)
 
 	3.1.5 release
@@ -24152,6 +32015,13 @@
 
 	Borders can now be specified indiviually for each model
 
+2000-05-30	<jmv@sourceforge.net>
+
+	Files:	jmv/print-dither.c (1.2) (+34 -23)
+		jmv/print-escp2.c (1.2) (+93 -25)
+
+	Density-based dithering
+
 2000-05-29	<rlk@sourceforge.net>
 
 	Files:	print-canon.c (1.48) (+23 -21)
@@ -24166,12 +32036,22 @@
 2000-05-28	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.47) (+3 -3)
+		printers.xml (1.10) (+2 -2)
 
 	Fixed density, gamma and black level
 
+2000-05-27	<cpbs@sourceforge.net>
+
+	Files:	configure.in (1.16) (+2 -2)
+
+	Look for lpc and lpstat in some more places; if you're building as a
+	normal user, these are likely not in your $PATH.
+
 2000-05-25	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.51) (+23 -6)
+	Files:	ChangeLog (1.11) (+167 -0)
+		README.dither (1.5) (+5 -0)
+		print-dither.c (1.51) (+23 -6)
 		print-escp2.c (1.151) (+6 -7)
 		print.h (1.53) (+3 -2)
 
@@ -24211,6 +32091,12 @@
 
 2000-05-24	<rlk@sourceforge.net>
 
+	Files:	Ghost/.cvsignore (1.2) (+4 -0)
+
+	New files
+
+2000-05-24	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.149) (+3 -2)
 
 	Save memory on the variable dot size printers.
@@ -24225,19 +32111,60 @@
 
 2000-05-24	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.35) (+9 -6)
+	Files:	ChangeLog (1.10) (+1205 -938)
+		Ghost/gdevstp.c (1.13) (+98 -268)
+		Ghost/gdevstp.h (1.3) (+16 -1)
+		Makefile.am (1.35) (+9 -6)
 		README (1.16) (+1 -1)
 		gimp_main_window.c (1.9) (+3 -3)
 		gtk_main_window.c (1.13) (+3 -4)
 		print-dither.c (1.47) (+47 -7)
 		print-escp2.c (1.148) (+5 -2)
 		print_gimp.h (1.14) (+2 -2)
-		quickmatrix199-2.h (1.1) ( )
-		quickmatrix199.h (1.1) ( )
-		quickmatrix257.h (1.1) ( )
+		printers.xml (1.9) (+8 -0)
+		quickmatrix199-2.h (1.1) (added)
+		quickmatrix199.h (1.1) (added)
+		quickmatrix257.h (1.1) (added)
 
 	Incorporate Thomas Tonino's dither matrices.
 
+2000-05-23	<cpbs@sourceforge.net>
+
+	Files:	debian/README.building.from.CVS (1.1) (added)
+		debian/changelog (1.1) (added)
+		debian/packages (1.1) (added)
+
+	Added Debianisation files in debian/. subdirectory.
+
+2000-05-23	<jmv@sourceforge.net>
+
+	Files:	jmv/README (1.1) (added)
+
+
+	This is experimental stuff for the epson stylus photo 870
+
+2000-05-23	<jmv@sourceforge.net>
+
+	Files:	jmv/print-escp2.c (1.1) (added)
+
+
+	Experimental for epson stylus photo 870
+
+	This is based on rlk's print-escp2.c v 1.145
+
+2000-05-23	<jmv@sourceforge.net>
+
+	Files:	jmv/print.h (1.1) (added)
+
+
+	Experimental for epson 870
+
+2000-05-23	<jmv@sourceforge.net>
+
+	Files:	jmv/print-dither.c (1.1) (added)
+
+	*** empty log message ***
+
 2000-05-23	<ttonino@sourceforge.net>
 
 	Files:	print-dither.c (1.46) (+13 -9)
@@ -24286,6 +32213,18 @@
 	Output format slightky changed. Added parameter sections for 2 useful
 	199x199 matrices and an (untetsed) 257x257 matrix.
 
+2000-05-22	<ttonino@sourceforge.net>
+
+	Files:	Matgen/quickmatrix257.i (1.1) (added)
+
+	Untested 257x257 dither matrix.
+
+2000-05-21	<rlk@sourceforge.net>
+
+	Files:	mkchlog (1.2) (+4 -2)
+
+	Record revision number along with each file
+
 2000-05-21	<ttonino@sourceforge.net>
 
 	Files:	print-escp2.c (1.147) (+3 -3)
@@ -24302,6 +32241,12 @@
 
 	Only tested with Epson Stylus Color 600 so far.
 
+2000-05-21	<ttonino@sourceforge.net>
+
+	Files:	Matgen/quickmatrix199-2.i (1.1) (added)
+
+	This matrix is equivalent but not corelated to quickmatrix199.i.
+
 2000-05-20	<rlk@sourceforge.net>
 
 	Files:	print-dither.c (1.42) (+17 -12)
@@ -24318,9 +32263,29 @@
 	artifacts.  This may not be a good decision; time will tell.  We also
 	need a better matrix for that.
 
+2000-05-20	<ttonino@sourceforge.net>
+
+	Files:	Matgen/patched-print-dither.c (1.4) (+22 -62)
+
+	Much cleaner now. Removed code I doidn't understand. Faster now.
+	Did not damage anything, it seems.
+
+2000-05-19	<ttonino@sourceforge.net>
+
+	Files:	Matgen/patched-print-dither.c (1.3) (+2 -0)
+
+	Solved problem in very dark areas by setting limit to bk. Tested with 0.1 and 0.699 for dither_set_black_lower and -_upper, respectively, on Epson 600.
+
+2000-05-19	<ttonino@sourceforge.net>
+
+	Files:	Matgen/patched-print-dither.c (1.2) (+70 -65)
+
+	Version with more black generation. Does good job at dark colors.
+
 2000-05-19	<smiller@sourceforge.net>
 
-	Files:	gtk_main_window.c (1.12) (+117 -98)
+	Files:	configure.in (1.15) (+1 -1)
+		gtk_main_window.c (1.12) (+117 -98)
 
 
 		Applied patch supplied by Thorsten Schnier for some positioning errors
@@ -24329,6 +32294,7 @@
 2000-05-18	<gandy@sourceforge.net>
 
 	Files:	print-canon.c (1.45) (+4 -2)
+		printers.xml (1.8) (+8 -0)
 
 	Activated the canon BJC 8200 for testing (no idea if it works at all..)
 
@@ -24346,7 +32312,21 @@
 
 2000-05-17	<ttonino@sourceforge.net>
 
-	Files:	Matgen/quickdistance.c (1.1) ( )
+	Files:	Matgen/patched-print-dither.c (1.1) (added)
+
+	Patched print-dither.c to include matrix generated by quickdistance.c.
+	Gives good results IMHO, but should (?) really be integrated with the
+	main version.
+
+2000-05-17	<ttonino@sourceforge.net>
+
+	Files:	Matgen/quickmatrix199.i (1.1) (added)
+
+	Slightly cleaned up output of quickmatrix.c. Used in patched print-dither.c.
+
+2000-05-17	<ttonino@sourceforge.net>
+
+	Files:	Matgen/quickdistance.c (1.1) (added)
 
 	New version of dither generation program. Unrelated to patented software.
 	First 4 points for a matrix are set by hand - these 4 do not conflict when
@@ -24427,6 +32407,36 @@
 
 2000-05-13	<sharkey@sourceforge.net>
 
+	Files:	make-deb.sh (1.1) (added)
+
+	First version of a script for building a debian package.  So far, it
+	only does the ghost script driver, only works for Debian 2.2, and requires
+	the caller to be root.  All of these things can be fixed, but, I'm running
+	late...
+
+2000-05-13	<sharkey@sourceforge.net>
+
+	Files:	Ghost/debian-patch (1.1) (added)
+
+	A patch to the Debian control and rules files for building the gimp-print
+	ghost script driver as a Debian package.
+
+2000-05-13	<sharkey@sourceforge.net>
+
+	Files:	Ghost/debian-patch-stp (1.1) (added)
+
+	A little script which can patch the Debian gs sources with the gimp-print
+	driver.  It gets included into the main Debian build scripts, don't execute
+	this by itself.
+
+2000-05-13	<sharkey@sourceforge.net>
+
+	Files:	Ghost/devs.mak.addon-5.10 (1.1) (added)
+
+	This can be used to build agains gs 5.10.
+
+2000-05-13	<sharkey@sourceforge.net>
+
 	Files:	print-escp2.c (1.140) (+15 -3)
 
 	Change the 750 from MODEL_INIT_STANDARD to MODEL_INIT_900.  Allows USB to
@@ -24434,11 +32444,13 @@
 
 2000-05-13	<rlk@sourceforge.net>
 
-	Files:	escp2-weavetest.c (1.10) (+53 -11)
+	Files:	ChangeLog (1.9) (+7 -0)
+		escp2-weavetest.c (1.10) (+53 -11)
 		print-dither.c (1.39) (+199 -59)
 		print-escp2.c (1.139) (+276 -102)
 		print-util.c (1.90) (+17 -13)
 		print.h (1.52) (+5 -2)
+		run-weavetest (1.13) (+22 -12)
 
 	Allow printing to the top edge and much closer to the bottom on Epson
 	printers (major change in the softweave code).
@@ -24457,6 +32469,19 @@
 
 	Fix for variable drop size printing
 
+2000-05-09	<rlk@sourceforge.net>
+
+	Files:	README.dither (1.4) (+142 -86)
+
+	Update to reflect current reality
+
+2000-05-07	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.8) (+251 -0)
+		RELNOTES (1.10) (+14 -5)
+
+	3.1.4 release
+
 2000-05-06	<rlk@sourceforge.net>
 
 	Files:	gtk_color_window.c (1.9) (+2 -2)
@@ -24485,6 +32510,12 @@
 
 2000-05-05	<davehill@sourceforge.net>
 
+	Files:	printers.xml (1.7) (+8 -0)
+
+	Added DJ690.
+
+2000-05-05	<davehill@sourceforge.net>
+
 	Files:	print-pcl.c (1.48) (+214 -29)
 
 	Added DJ690 Photo mode (thanks to Henk Verleye).
@@ -24552,6 +32583,7 @@
 		print-canon.c (1.41) (+11 -5)
 		print-escp2.c (1.135) (+37 -20)
 		print-pcl.c (1.47) (+7 -2)
+		run-weavetest (1.12) (+13 -13)
 
 	Improve use of black ink to reduce sharp grain.
 
@@ -24590,17 +32622,30 @@
 
 2000-05-01	<ttonino@sourceforge.net>
 
-	Files:	Matgen/dither-distance.c (1.1) ( )
+	Files:	Matgen/dither-distance.c (1.1) (added)
 
 	Code used to create 73dither-distance.i. Initial 3 dots may need improvement.
 	A new version with some randomization is on its way.
 
+2000-05-01	<ttonino@sourceforge.net>
+
+	Files:	Matgen/73dither-distance.i (1.1) (added)
+
+	73dither-distance is the first dither matrix I'm happy with. Generated with
+	a simple algorithm (in dither-distance.c) it generated matrices quicker
+	than earlier tries. I think the output is a little bit too regular, but
+	ordered dither 720 DPI looks not too diferent from a Floyd-Steinberg now
+	although problems like light speckles remain.
+
 2000-04-29	<rlk@sourceforge.net>
 
-	Files:	README (1.15) (+1 -1)
+	Files:	Ghost/gdevstp.c (1.12) (+2 -2)
+		README (1.15) (+1 -1)
+		configure.in (1.14) (+1 -1)
 		escp2-weavetest.c (1.8) (+3 -2)
 		print-escp2.c (1.133) (+25 -7)
 		print_gimp.h (1.11) (+2 -2)
+		printers.xml (1.6) (+8 -0)
 
 	Preliminary support for Stylus Color 760
 
@@ -24614,6 +32659,14 @@
 
 	Improve photo and line art mode
 
+2000-04-29	<rlk@sourceforge.net>
+
+	Files:	RedHat/ghostscript-5.50.spec (1.1) (added)
+		RedHat/gimp-print.spec (1.1) (added)
+		RedHat/gs.spec.diff (1.1) (added)
+
+	Spec files for Red Hat RPM's, from Mark Hindess <beanz@uklinux.net>
+
 2000-04-27	<rlk@sourceforge.net>
 
 	Files:	print-ps.c (1.24) (+8 -3)
@@ -24650,6 +32703,12 @@
 
 	try again for 660
 
+2000-04-25	<rlk@sourceforge.net>
+
+	Files:	printers.xml (1.5) (+8 -0)
+
+	The other part of the Epson Stylus 660
+
 2000-04-24	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.130) (+22 -6)
@@ -24666,7 +32725,8 @@
 
 2000-04-24	<rlk@sourceforge.net>
 
-	Files:	gtk_main_window.c (1.11) (+2 -2)
+	Files:	Ghost/README (1.15) (+6 -0)
+		gtk_main_window.c (1.11) (+2 -2)
 		print-dither.c (1.29) (+47 -13)
 		print-escp2.c (1.129) (+9 -5)
 
@@ -24686,7 +32746,20 @@
 
 2000-04-22	<rlk@sourceforge.net>
 
-	Files:	print_gimp.h (1.10) (+2 -2)
+	Files:	ChangeLog (1.7) (+60 -0)
+
+	Update change log for 3.1.3
+
+2000-04-22	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.13) (+1 -1)
+
+	Release 3.1.3
+
+2000-04-22	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.9) (+6 -3)
+		print_gimp.h (1.10) (+2 -2)
 
 	Release 3.1.2
 
@@ -24710,7 +32783,22 @@
 
 2000-04-22	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.27) (+9 -2)
+	Files:	Ghost/README (1.14) (+45 -14)
+		Ghost/gdevstp.c (1.11) (+6 -5)
+		Ghost/gs-stp.pdq (1.3) (+43 -8)
+
+	Bug fixes to the driver, so it should now work correctly.
+
+	Update documentation.
+
+	Updated the pdq description.
+
+2000-04-22	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.6) (+85 -0)
+		Ghost/README (1.13) (+2 -1)
+		Ghost/gdevstp.c (1.10) (+2 -2)
+		print-dither.c (1.27) (+9 -2)
 
 	Break up ordered dither pattern a bit.
 
@@ -24732,7 +32820,8 @@
 
 2000-04-20	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.6) (+2 -2)
+	Files:	RELNOTES (1.8) (+18 -0)
+		gimp_color_window.c (1.6) (+2 -2)
 		gimp_main_window.c (1.7) (+2 -2)
 		gtk_color_window.c (1.8) (+2 -2)
 		gtk_main_window.c (1.10) (+2 -2)
@@ -24752,7 +32841,14 @@
 
 2000-04-19	<rlk@sourceforge.net>
 
-	Files:	gimp_main_window.c (1.6) (+11 -10)
+	Files:	README.dither (1.3) (+179 -41)
+
+	Intermediate discussion of dithering
+
+2000-04-19	<rlk@sourceforge.net>
+
+	Files:	RELNOTES (1.7) (+1 -1)
+		gimp_main_window.c (1.6) (+11 -10)
 
 	Fix (somewhat) handling of orientation; also prevent scaling from
 	exceeding 100% (the Gimp toolkit handles these things correctly; the
@@ -24772,7 +32868,8 @@
 
 2000-04-18	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.38) (+7 -4)
+	Files:	ChangeLog (1.5) (+33 -0)
+		print-canon.c (1.38) (+7 -4)
 		print-dither.c (1.24) (+24 -18)
 		print-escp2.c (1.123) (+23 -20)
 		print-pcl.c (1.44) (+15 -12)
@@ -24800,7 +32897,9 @@
 
 2000-04-16	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.5) (+5 -12)
+	Files:	Ghost/README (1.12) (+5 -0)
+		Ghost/gdevstp.c (1.9) (+308 -215)
+		gimp_color_window.c (1.5) (+5 -12)
 		gimp_main_window.c (1.5) (+2 -1)
 		gtk_color_window.c (1.7) (+9 -7)
 		gtk_main_window.c (1.9) (+2 -1)
@@ -24822,6 +32921,13 @@
 	Added the dither algo option menu (mostly cut & paste from
 	Steve's changes).
 
+2000-04-16	<rlk@sourceforge.net>
+
+	Files:	ChangeLog (1.4) (+3253 -5)
+		mkchlog (1.1) (added)
+
+	Updated change log
+
 2000-04-16	<smiller@sourceforge.net>
 
 	Files:	gtk_color_window.c (1.6) (+120 -2)
@@ -24841,19 +32947,6 @@
 
 	New dithering code
 
-2000-04-16	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.19.2.6) (+13 -18)
-
-	Final
-
-2000-04-16	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.19.2.5) (+113 -56)
-		print.h (1.48.4.2) (+5 -2)
-
-	More improvements
-
 2000-04-15	<mitsch@sourceforge.net>
 
 	Files:	gimp_color_window.c (1.3) (+1 -4)
@@ -24872,7 +32965,7 @@
 		gimp_main_window.c (1.3) (+3 -5)
 		gtk_color_window.c (1.4) (+10 -16)
 		gtk_main_window.c (1.7) (+2 -8)
-		print-intl.h (1.1) ( )
+		print-intl.h (1.1) (added)
 		print.c (1.85) (+221 -258)
 
 	* Makefile.am
@@ -24892,12 +32985,6 @@
 	Also had to move the GtkAdjustment definitions to print.c and made
 	them extern in the ui files.
 
-2000-04-14	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.19.2.4) (+95 -11)
-
-	Other dithering options
-
 2000-04-13	<davehill@sourceforge.net>
 
 	Files:	pcl-unprint.c (1.8) (+323 -209)
@@ -24909,6 +32996,7 @@
 2000-04-13	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.41) (+673 -320)
+		printers.xml (1.4) (+33 -1)
 
 	Added DJ340, DJ400, DJ2000, DJ2500.
 	Added Quick-dry photo & transparency media.
@@ -24938,35 +33026,17 @@
 	Fixed problem with options being carried from one printer to
 	another.
 
-2000-04-13	<rlk@sourceforge.net>
+2000-04-10	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.19.2.3) (+17 -10)
-		print-escp2.c (1.120.2.3) (+8 -5)
+	Files:	Ghost/contrib.mak.addon (1.6) (+2 -2)
 
-	Much improved
+	This really is needed for gs 6.01
 
-2000-04-12	<rlk@sourceforge.net>
+2000-04-10	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.19.2.2) (+10 -7)
-		print-escp2.c (1.120.2.2) (+197 -10)
+	Files:	Ghost/gdevstp.c (1.8) (+2 -1)
 
-	some improvement
-
-2000-04-12	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.119.2.3) (+7 -4)
-
-	Constant hacking
-
-2000-04-11	<rlk@sourceforge.net>
-
-	Files:	print-canon.c (1.35.4.1) (+16 -30)
-		print-dither.c (1.19.2.1) (+429 -1108)
-		print-escp2.c (1.120.2.1) (+49 -41)
-		print-pcl.c (1.40.4.1) (+24 -10)
-		print.h (1.48.4.1) (+57 -22)
-
-	Yet another dither hack
+	botch
 
 2000-04-06	<rlk@sourceforge.net>
 
@@ -24982,6 +33052,12 @@
 
 2000-04-04	<rlk@sourceforge.net>
 
+	Files:	parse-escp2 (1.3) (+1 -0)
+
+	another command
+
+2000-04-04	<rlk@sourceforge.net>
+
 	Files:	escp2-weavetest.c (1.5) (+2 -2)
 		print-escp2.c (1.120) (+44 -25)
 
@@ -24989,8 +33065,8 @@
 
 2000-03-31	<rlk@sourceforge.net>
 
-	Files:	gimp_color_window.c (1.1) ( )
-		gimp_main_window.c (1.1) ( )
+	Files:	gimp_color_window.c (1.1) (added)
+		gimp_main_window.c (1.1) (added)
 
 	from Mitsch
 
@@ -25006,36 +33082,10 @@
 
 2000-03-29	<rlk@sourceforge.net>
 
-	Files:	dither_matrix.c (1.1.2.2) (+0 -0)
-
-	Again: fuck patents!
-
-2000-03-29	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.18.2.2) (+5 -28)
-		print-escp2.c (1.119.2.2) (+7 -4)
-
-	Fuck patents
-
-2000-03-29	<rlk@sourceforge.net>
-
-	Files:	dither_matrix.c (1.1.2.1) (+2573 -0)
-
-	need this too
-
-2000-03-29	<rlk@sourceforge.net>
-
-	Files:	dither_matrix.c (1.1) ( )
+	Files:	dither_matrix.c (1.1) (added)
 
 	file dither_matrix.c was initially added on branch ordered-dither-branch.
 
-2000-03-29	<rlk@sourceforge.net>
-
-	Files:	print-dither.c (1.18.2.1) (+374 -5)
-		print-escp2.c (1.119.2.1) (+201 -14)
-
-	Put this in for safety and for people to play with it
-
 2000-03-27	<smiller@sourceforge.net>
 
 	Files:	Makefile.am (1.29) (+1 -0)
@@ -25094,6 +33144,12 @@
 
 	note about ldconfig
 
+2000-03-25	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.12) (+5 -5)
+
+	minor fixes
+
 2000-03-24	<rlk@sourceforge.net>
 
 	Files:	README (1.13) (+6 -0)
@@ -25121,6 +33177,12 @@
 
 2000-03-22	<rlk@sourceforge.net>
 
+	Files:	RELNOTES (1.6) (+7 -3)
+
+	release note tweaks
+
+2000-03-22	<rlk@sourceforge.net>
+
 	Files:	print.c (1.78) (+3 -3)
 
 	release
@@ -25140,12 +33202,20 @@
 2000-03-21	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.40) (+42 -4)
+		printers.xml (1.3) (+8 -0)
 
 	Added Deskjet 9xx series.
 
 2000-03-21	<rlk@sourceforge.net>
 
+	Files:	run-weavetest (1.11) (+7 -2)
+
+	more minor improvements
+
+2000-03-21	<rlk@sourceforge.net>
+
 	Files:	escp2-weavetest.c (1.4) (+5 -2)
+		run-weavetest (1.10) (+21 -15)
 
 	cleanup
 
@@ -25165,8 +33235,10 @@
 
 2000-03-20	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.24) (+2 -0)
+	Files:	INSTALL (1.5) (+1 -1)
+		Makefile.am (1.24) (+2 -0)
 		README (1.12) (+1 -1)
+		RELNOTES (1.5) (+14 -1)
 		print-escp2.c (1.117) (+6 -3)
 
 	Try to maintain dependency order of lex on yacc stuff
@@ -25187,14 +33259,24 @@
 
 2000-03-17	<smiller@sourceforge.net>
 
+	Files:	print.h (1.46) (+5 -4)
+
+	*** empty log message ***
+
+2000-03-17	<smiller@sourceforge.net>
+
+	Files:	print.h (1.45) (+15 -9)
+		print_gimp.h (1.1) (added)
+
+	*** empty log message ***
+
+2000-03-17	<smiller@sourceforge.net>
+
 	Files:	Makefile.am (1.22) (+14 -28)
-		gtk_color_window.c (1.1) ( )
-		gtk_main_window.c (1.1) ( )
+		gtk_color_window.c (1.1) (added)
+		gtk_main_window.c (1.1) (added)
 		print.c (1.76) (+202 -2689)
 		print.h (1.44) (+28 -43)
-		print.h (1.45) (+15 -9)
-		print.h (1.46) (+5 -4)
-		print_gimp.h (1.1) ( )
 
 	*** empty log message ***
 
@@ -25214,12 +33296,15 @@
 
 	Files:	escp2-weavetest.c (1.3) (+8 -7)
 		print-escp2.c (1.116) (+57 -28)
+		run-weavetest (1.9) (+4 -3)
 
 	Added 1440x1440 mode
 
 2000-03-13	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.35) (+44 -31)
+	Files:	Ghost/README (1.11) (+22 -7)
+		Ghost/gdevstp.c (1.7) (+3 -2)
+		print-canon.c (1.35) (+44 -31)
 		print-dither.c (1.13) (+217 -319)
 		print-escp2.c (1.115) (+23 -7)
 		print-pcl.c (1.38) (+19 -5)
@@ -25231,13 +33316,18 @@
 
 2000-03-11	<rlk@sourceforge.net>
 
-	Files:	print-dither.c (1.12) (+77 -44)
+	Files:	Ghost/README (1.10) (+4 -2)
+		Ghost/gdevstp.c (1.6) (+77 -72)
+		Ghost/gdevstp.h (1.2) (+1 -5)
+		Ghost/gs-stp.pdq (1.2) (+24 -3)
+		print-dither.c (1.12) (+77 -44)
 
 	Finish the dither job, and fix up the Ghostscript driver
 
 2000-03-11	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.34) (+20 -2)
+	Files:	README.dither (1.2) (+10 -0)
+		print-canon.c (1.34) (+20 -2)
 		print-dither.c (1.11) (+69 -32)
 		print-escp2.c (1.114) (+45 -17)
 		print-pcl.c (1.37) (+25 -4)
@@ -25248,13 +33338,19 @@
 
 2000-03-10	<rlk@sourceforge.net>
 
-	Files:	.cvsignore (1.5) (+1 -0)
-		.cvsignore (1.6) (+1 -0)
+	Files:	.cvsignore (1.6) (+1 -0)
 		Makefile.am (1.21) (+1 -1)
+		README.dither (1.1) (added)
 		print-dither.c (1.10) (+185 -328)
 
 	Performance optimizations, documentation
 
+2000-03-09	<rlk@sourceforge.net>
+
+	Files:	.cvsignore (1.5) (+1 -0)
+
+	Performance optimizations, documentation
+
 2000-03-07	<rlk@sourceforge.net>
 
 	Files:	print-canon.c (1.33) (+135 -132)
@@ -25272,16 +33368,24 @@
 
 	A bit more stuff
 
+2000-03-07	<davehill@sourceforge.net>
+
+	Files:	Makefile.standalone (1.10) (+33 -10)
+
+	Build "printdef". Deleted unused "SRC" variable.
+
 2000-03-06	<rlk@sourceforge.net>
 
-	Files:	escp2-weavetest.c (1.2) (+6 -6)
+	Files:	configure.in (1.11) (+0 -2)
+		escp2-weavetest.c (1.2) (+6 -6)
 		print-escp2.c (1.111) (+114 -138)
 
 	More cleanup stuff
 
 2000-03-06	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.20) (+3 -1)
+	Files:	Ghost/gdevstp.c (1.5) (+24 -5)
+		Makefile.am (1.20) (+3 -1)
 		print-canon.c (1.32) (+9 -3)
 		print-escp2.c (1.110) (+9 -4)
 		print-pcl.c (1.35) (+10 -3)
@@ -25292,6 +33396,7 @@
 		printdef.h (1.3) (+1 -39)
 		printdefl.l (1.3) (+2 -5)
 		printdefy.y (1.2) (+89 -59)
+		printers.xml (1.2) (+49 -196)
 
 	more rearrangement
 
@@ -25305,29 +33410,33 @@
 
 2000-03-05	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.18) (+18 -7)
+	Files:	Ghost/README (1.9) (+3 -2)
+		Makefile.am (1.18) (+18 -7)
+		configure.in (1.10) (+5 -1)
 		print-escp2.c (1.109) (+156 -135)
 		print-util.c (1.84) (+10 -116)
 		print.c (1.72) (+5 -5)
 		print.h (1.40) (+26 -12)
-		printdef.l (1.2) (+1 -1)
-		printdef.y (1.2) (+1 -1)
-		printdefl.l (1.1) ( )
-		printdefy.y (1.1) ( )
+		printdef.l (1.2) (removed)
+		printdef.y (1.2) (removed)
+		printdefl.l (1.1) (added)
+		printdefy.y (1.1) (added)
+		printers.xml (1.1) (added)
 
 	Create list of printers externally
 
 2000-03-05	<rlk@sourceforge.net>
 
-	Files:	print.c (1.71) (+3 -3)
+	Files:	RELNOTES (1.4) (+11 -1)
+		print.c (1.71) (+3 -3)
 
 	Release stuff
 
 2000-03-05	<rlk@sourceforge.net>
 
-	Files:	printdef.h (1.1) ( )
-		printdef.l (1.1) ( )
-		printdef.y (1.1) ( )
+	Files:	printdef.h (1.1) (added)
+		printdef.l (1.1) (added)
+		printdef.y (1.1) (added)
 
 	Start of new printer identification
 
@@ -25352,7 +33461,8 @@
 
 2000-03-02	<khk@sourceforge.net>
 
-	Files:	print-escp2.c (1.106) (+10 -7)
+	Files:	ChangeLog (1.3) (+4 -0)
+		print-escp2.c (1.106) (+10 -7)
 
 	Cleaned up some compiler warnings in print-escp2.c
 
@@ -25402,6 +33512,7 @@
 
 	Files:	print-escp2.c (1.102) (+63 -31)
 		print-util.c (1.79) (+7 -2)
+		run-weavetest (1.8) (+1 -1)
 
 	1) Should be able to speed up black printing quite a bit for some models.
 
@@ -25419,6 +33530,12 @@
 
 	Improve printing to the bottom, and do memory allocation the way intended
 
+2000-02-29	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.9) (+4 -4)
+
+	foolish bogon
+
 2000-02-28	<davehill@sourceforge.net>
 
 	Files:	pcl-unprint.c (1.5) (+122 -63)
@@ -25440,6 +33557,12 @@
 
 2000-02-28	<rlk@sourceforge.net>
 
+	Files:	configure.in (1.8) (+4 -4)
+
+	Fix configure
+
+2000-02-28	<rlk@sourceforge.net>
+
 	Files:	print-dither.c (1.7) (+112 -46)
 		print-escp2.c (1.99) (+380 -370)
 		print.h (1.39) (+3 -3)
@@ -25452,6 +33575,12 @@
 
 	Experimental print.c from 3.0
 
+2000-02-27	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.7) (+28 -0)
+
+	Find lp commands
+
 2000-02-27	<sharkey@sourceforge.net>
 
 	Files:	unprint.c (1.37) (+116 -28)
@@ -25470,6 +33599,20 @@
 	caused it to crash if unset, as well as a few other minor things not worth
 	mentioning.
 
+2000-02-27	<sharkey@sourceforge.net>
+
+	Files:	Ghost/README (1.8) (+5 -2)
+
+	The section added on installing under Debian contained some minor
+	inaccuracies on how to fetch the source.  I've fixed and clarified the
+	procedure.
+
+2000-02-27	<khk@sourceforge.net>
+
+	Files:	ChangeLog (1.2) (+4 -1)
+
+	First entry in ChangeLog.
+
 2000-02-27	<khk@sourceforge.net>
 
 	Files:	print-ps.c (1.20) (+10 -2)
@@ -25516,6 +33659,12 @@
 
 	Rename dither_{black,cmyk}4 to dither_{black,cmyk}_n, and add argument to specify how levels are to be encoded
 
+2000-02-26	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.5) (+2 -2)
+
+	Remove apparently spurious stuff
+
 2000-02-25	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.32) (+386 -49)
@@ -25525,8 +33674,15 @@
 
 2000-02-25	<rlk@sourceforge.net>
 
+	Files:	Ghost/README (1.7) (+51 -11)
+
+	Debian
+
+2000-02-25	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.96) (+67 -16)
 		print-util.c (1.77) (+11 -2)
+		run-weavetest (1.7) (+1 -1)
 
 	1) Stylus Color 460 (really a variant 440, at least until I learn otherwise).
 
@@ -25534,6 +33690,19 @@
 
 	3) make variable dot size the default for those printers.
 
+2000-02-25	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.6) (+11 -9)
+		Ghost/gdevstp.c (1.4) (+7 -14)
+
+	Clarification
+
+2000-02-24	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.5) (+16 -2)
+
+	instructions for people downloading from cvs
+
 2000-02-24	<gandy@sourceforge.net>
 
 	Files:	unprint.c (1.36) (+35 -10)
@@ -25570,19 +33739,19 @@
 
 2000-02-24	<rlk@sourceforge.net>
 
-	Files:	README (1.11) (+1 -1)
+	Files:	INSTALL (1.4) (+1 -1)
+		README (1.11) (+1 -1)
+		RELNOTES (1.3) (+2 -2)
+		configure.in (1.6) (+1 -1)
 		print.c (1.65) (+3 -3)
 
 	Bump version number for next release, whenever that may be
 
 2000-02-24	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.39.2.4) (+19 -3)
-		print-pcl.c (1.14.2.2) (+8 -3)
-		print-util.c (1.49.2.3) (+0 -427)
-		print.c (1.38.2.7) (+4 -4)
+	Files:	Ghost/README (1.4) (+13 -0)
 
-	3.0.9 fixes
+	PDQ
 
 2000-02-23	<davehill@sourceforge.net>
 
@@ -25609,12 +33778,18 @@
 2000-02-23	<gandy@sourceforge.net>
 
 	Files:	Makefile.am (1.17) (+1 -2)
-		canon-unprint.c (1.3) (+1 -1)
+		canon-unprint.c (1.3) (removed)
 
 	Removed in favour of unprint.c
 
 2000-02-23	<gandy@sourceforge.net>
 
+	Files:	canon-unprint.cpp (1.2) (removed)
+
+	Removed in favour for unprint.c
+
+2000-02-23	<gandy@sourceforge.net>
+
 	Files:	unprint.c (1.32) (+40 -20)
 
 	Fixed severe bug in rle_decode() and parse_canon()
@@ -25657,21 +33832,9 @@
 
 2000-02-23	<rlk@sourceforge.net>
 
-	Files:	print.c (1.38.2.6) (+298 -90)
-
-	1) New save settings/print/print and save settings buttons.
-
-	2) Save "file" printer correctly.
-
-	3) Location boxes/size and place correctly
-
-2000-02-22	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.39.2.3) (+12 -7)
-		print-util.c (1.49.2.2) (+130 -62)
-		print.c (1.38.2.5) (+29 -7)
+	Files:	Ghost/gs-stp.pdq (1.1) (added)
 
-	3.0.7
+	pdq/xpdq file for stp; supplied by Grant Taylor
 
 2000-02-22	<gandy@sourceforge.net>
 
@@ -25705,6 +33868,12 @@
 
 2000-02-21	<rlk@sourceforge.net>
 
+	Files:	RELNOTES (1.2) (+3 -0)
+
+	update
+
+2000-02-21	<rlk@sourceforge.net>
+
 	Files:	print-dither.c (1.5) (+67 -49)
 		print-escp2.c (1.92) (+12 -4)
 		print-util.c (1.76) (+64 -6)
@@ -25724,17 +33893,20 @@
 
 2000-02-21	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.16) (+1 -1)
+	Files:	INSTALL (1.3) (+15 -5)
+		Makefile.am (1.16) (+1 -1)
+		RELNOTES (1.1) (added)
 		pcl-unprint.c (1.3) (+8 -3)
 		print-canon.c (1.26) (+12 -5)
 		print-escp2.c (1.91) (+13 -4)
 		print-util.c (1.75) (+281 -271)
+		run-weavetest (1.6) (+1 -1)
 
 	Minor release prep
 
 2000-02-21	<gandy@sourceforge.net>
 
-	Files:	canon-unprint.c (1.1) ( )
+	Files:	canon-unprint.c (1.1) (added)
 
 	* cloned escp2-unprint.c and replaced parse_escp2() with parse_canon()
 	* only checks for correct syntax but doesn't really read any contents yet
@@ -25813,6 +33985,7 @@
 
 	Files:	.cvsignore (1.4) (+4 -1)
 		Makefile.am (1.15) (+2 -1)
+		run-weavetest (1.5) (+9 -1)
 
 	minor stuff
 
@@ -25837,6 +34010,7 @@
 2000-02-18	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.84) (+7 -3)
+		run-weavetest (1.4) (+2 -2)
 
 	Update line spacing for ESC900
 
@@ -25909,12 +34083,15 @@
 2000-02-17	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.13) (+5 -5)
-		escp2-unprint.c (1.1) ( )
-		escp2-weavetest.c (1.1) ( )
-		pcl-unprint.c (1.1) ( )
-		pclunprint.c (1.2) (+8 -4)
-		unprint.c (1.20) (+1 -1)
-		weavetest.c (1.14) (+1 -1)
+		canon-unprint.cpp (1.1) (added)
+		canunprint.cpp (1.2) (removed)
+		escp2-unprint.c (1.1) (added)
+		escp2-weavetest.c (1.1) (added)
+		pcl-unprint.c (1.1) (added)
+		pclunprint.c (1.2) (removed)
+		run-weavetest (1.3) (+1 -1)
+		unprint.c (1.20) (removed)
+		weavetest.c (1.14) (removed)
 
 	Rename various programs
 
@@ -25937,6 +34114,16 @@
 
 	This is worth a version 0.9 revision number.
 
+2000-02-16	<sharkey@sourceforge.net>
+
+	Files:	parse-escp2 (1.2) (+5 -5)
+
+	$bugs-=4;
+
+	Change $i to $k where appropriate.
+
+	Thought I was going nuts for a while there....
+
 2000-02-16	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.81) (+10 -3)
@@ -26009,7 +34196,7 @@
 
 2000-02-15	<davehill@sourceforge.net>
 
-	Files:	pclunprint.c (1.1) ( )
+	Files:	pclunprint.c (1.1) (added)
 
 	Initial version. Only works for mono 2 level uncompressed output
 	(i.e. Deskjet 500)
@@ -26028,7 +34215,8 @@
 
 2000-02-15	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.24) (+6 -3)
+	Files:	Ghost/gdevstp.c (1.3) (+13 -8)
+		print-canon.c (1.24) (+6 -3)
 		print-escp2.c (1.77) (+80 -38)
 		print-pcl.c (1.27) (+6 -3)
 		print-ps.c (1.18) (+6 -3)
@@ -26092,7 +34280,8 @@
 
 2000-02-14	<rlk@sourceforge.net>
 
-	Files:	print.c (1.55) (+7 -2)
+	Files:	configure.in (1.5) (+1 -1)
+		print.c (1.55) (+7 -2)
 
 	Try to support gimp 1.0
 
@@ -26107,12 +34296,20 @@
 	Files:	Makefile.am (1.10) (+18 -2)
 		NEWS (1.2) (+86 -1)
 		README (1.8) (+7 -79)
+		configure.in (1.4) (+1 -28)
 
 	Clean up configure stuff
 
 2000-02-13	<rlk@sourceforge.net>
 
+	Files:	Ghost/.cvsignore (1.1) (added)
+
+	.cvsignore
+
+2000-02-13	<rlk@sourceforge.net>
+
 	Files:	print-escp2.c (1.75) (+58 -41)
+		run-weavetest (1.2) (+1 -1)
 
 	More modes in run-weavetest, and attempt to handle column spacing in escp2
 
@@ -26140,7 +34337,8 @@
 
 2000-02-13	<rlk@sourceforge.net>
 
-	Files:	print-canon.c (1.22) (+17 -5)
+	Files:	Ghost/README (1.3) (+12 -12)
+		print-canon.c (1.22) (+17 -5)
 		print-escp2.c (1.74) (+16 -4)
 		print-pcl.c (1.26) (+18 -4)
 		print-ps.c (1.17) (+16 -4)
@@ -26151,15 +34349,42 @@
 
 2000-02-13	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.9) (+9 -1)
+	Files:	Ghost/contrib.mak.addon (1.4) (+1 -0)
+
+	one that slipped through the cracks
+
+2000-02-13	<rlk@sourceforge.net>
+
+	Files:	Ghost/README (1.2) (+1 -1)
+		Ghost/contrib.mak.addon (1.3) (+4 -4)
+		Ghost/gdevstp.c (1.2) (+5 -7)
+		Makefile.am (1.9) (+9 -1)
 		print-escp2.c (1.73) (+13 -6)
 		print-util.c (1.71) (+11 -2)
 
 	Build a Ghostscript driver!  No idea if it works yet...
 
+2000-02-13	<rlk@sourceforge.net>
+
+	Files:	Ghost/contrib.mak.addon (1.2) (+14 -11)
+
+	silliness
+
+2000-02-13	<rlk@sourceforge.net>
+
+	Files:	Ghost/COPYING (1.1) (added)
+		Ghost/ChangeLog (1.1) (added)
+		Ghost/README (1.1) (added)
+		Ghost/contrib.mak.addon (1.1) (added)
+		Ghost/gdevstp.c (1.1) (added)
+		Ghost/gdevstp.h (1.1) (added)
+
+	First cut at doing the real GhostScript driver
+
 2000-02-12	<rlk@sourceforge.net>
 
 	Files:	print-escp2.c (1.72) (+20 -12)
+		run-weavetest (1.1) (added)
 
 	Change spacing for newer printers
 
@@ -26187,13 +34412,6 @@
 
 	One more try
 
-2000-02-11	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.39.2.2) (+30 -5)
-		print.c (1.38.2.4) (+3 -3)
-
-	print 3.0.6 fixes
-
 2000-02-11	<sharkey@sourceforge.net>
 
 	Files:	unprint.c (1.12) (+2 -2)
@@ -26275,6 +34493,7 @@
 2000-02-10	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.8) (+3 -1)
+		configure.in (1.3) (+1 -0)
 
 	Add canunprint
 
@@ -26341,6 +34560,7 @@
 2000-02-09	<gandy@sourceforge.net>
 
 	Files:	.cvsignore (1.3) (+1 -0)
+		canunprint.cpp (1.1) (added)
 
 	Added canunprint to cvs
 
@@ -26431,6 +34651,12 @@
 
 	Major code-cleanups, prettified model capabilities
 
+2000-02-07	<gandy@sourceforge.net>
+
+	Files:	Makefile.standalone (1.9) (+2 -0)
+
+	Added print-dither to Makefile.standalone
+
 2000-02-07	<rlk@sourceforge.net>
 
 	Files:	.cvsignore (1.2) (+9 -0)
@@ -26490,11 +34716,23 @@
 2000-02-06	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.4) (+1 -0)
-		print-dither.c (1.1) ( )
+		print-dither.c (1.1) (added)
 		print-util.c (1.68) (+5 -1985)
 
 	Split out dither stuff from print-util
 
+2000-02-06	<rlk@sourceforge.net>
+
+	Files:	configure.in (1.2) (+7 -2)
+
+	Check for the Gimp as well as GTK.
+
+2000-02-06	<sharkey@sourceforge.net>
+
+	Files:	INSTALL (1.2) (+5 -1)
+
+	Slightly better installation instructions.
+
 2000-02-06	<sharkey@sourceforge.net>
 
 	Files:	unprint.c (1.6) (+138 -14)
@@ -26599,6 +34837,13 @@
 	was hoping that "pnmcat" would be able to read multiple files from stdin,
 	but that seems not to be the case.
 
+2000-02-05	<rlk@sourceforge.net>
+
+	Files:	Makefile (1.13) (removed)
+		Makefile.in (1.3) (removed)
+
+	Remove generated files
+
 2000-02-04	<sharkey@sourceforge.net>
 
 	Files:	unprint.c (1.4) (+93 -7)
@@ -26652,10 +34897,33 @@
 
 2000-02-03	<sharkey@sourceforge.net>
 
-	Files:	AUTHORS (1.1) ( )
-		COPYING (1.1) ( )
+	Files:	install-sh (1.1) (added)
+		missing (1.1) (added)
+		mkinstalldirs (1.1) (added)
+
+	Scripts needed for autoconf.
+
+2000-02-03	<sharkey@sourceforge.net>
+
+	Files:	configure.in (1.1) (added)
+
+	This is my first attempt at a configuration input file for autoconf.  It's
+	got some cheesy inelegant bits, but, it seems to work for me.  I'll try
+	to figure out how to do this properly later.  There are some complications
+	involved with the fact that libgimp requires that applications linking
+	to it provide the symbol PLUG_IN_INFO, which means that all of the
+	standard autoconf tests will fail.
+
+2000-02-03	<sharkey@sourceforge.net>
+
+	Files:	AUTHORS (1.1) (added)
+		COPYING (1.1) (added)
+		ChangeLog (1.1) (added)
+		INSTALL (1.1) (added)
+		Makefile (1.12) (+196 -240)
 		Makefile.am (1.3) (+11 -5)
-		NEWS (1.1) ( )
+		Makefile.in (1.2) (+174 -189)
+		NEWS (1.1) (added)
 
 	These files are required documentation files for applications using
 	autoconf for configuration.  The current versions of these files
@@ -26734,14 +35002,15 @@
 
 2000-02-01	<nicholas@sourceforge.net>
 
-	Files:	.cvsignore (1.1) ( )
+	Files:	.cvsignore (1.1) (added)
 
 	Added a .cvsignore file
 
 2000-02-01	<gandy@sourceforge.net>
 
 	Files:	Makefile.am (1.2) (+2 -0)
-		print-canon.c (1.1) ( )
+		Makefile.standalone (1.8) (+5 -2)
+		print-canon.c (1.1) (added)
 		print-util.c (1.58) (+10 -3)
 		print.h (1.29) (+12 -2)
 
@@ -26764,7 +35033,7 @@
 
 2000-01-29	<sharkey@sourceforge.net>
 
-	Files:	unprint.c (1.1) ( )
+	Files:	unprint.c (1.1) (added)
 
 	This is as much a test of my ability to commit code to the repository as
 	it is to get the code in there.
@@ -26825,7 +35094,15 @@
 
 2000-01-25	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.44) (+218 -180)
+	Files:	Makefile.standalone (1.7) (+4 -5)
+		parse-escp2 (1.1) (added)
+
+	Add parse-escp2, and roll back Makefile.standalone stuff that accidentally got committed
+
+2000-01-25	<rlk@sourceforge.net>
+
+	Files:	Makefile.standalone (1.6) (+5 -4)
+		print-escp2.c (1.44) (+218 -180)
 		print.c (1.43) (+20 -13)
 		weavetest.c (1.10) (+244 -22)
 
@@ -26839,7 +35116,8 @@
 
 2000-01-21	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.43) (+11 -4)
+	Files:	Makefile.standalone (1.5) (+1 -1)
+		print-escp2.c (1.43) (+11 -4)
 		print-util.c (1.54) (+87 -36)
 		print.c (1.42) (+4 -2)
 		print.h (1.25) (+5 -2)
@@ -26869,7 +35147,8 @@
 
 2000-01-17	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.41) (+143 -102)
+	Files:	Makefile (1.11) (+4 -4)
+		print-escp2.c (1.41) (+143 -102)
 		print-pcl.c (1.15) (+20 -13)
 		print-util.c (1.51) (+363 -123)
 		print.c (1.40) (+41 -4)
@@ -26886,13 +35165,6 @@
 
 2000-01-15	<rlk@sourceforge.net>
 
-	Files:	print-pcl.c (1.14.2.1) (+11 -7)
-		print.c (1.38.2.3) (+40 -3)
-
-	PCL and Gimp 1.0 patches from Dave Hill
-
-2000-01-15	<rlk@sourceforge.net>
-
 	Files:	print-escp2.c (1.40) (+275 -237)
 		print-util.c (1.50) (+11 -4)
 		print.c (1.39) (+15 -3)
@@ -26901,30 +35173,6 @@
 
 2000-01-13	<rlk@sourceforge.net>
 
-	Files:	print-util.c (1.49.2.1) (+6 -3)
-
-	Deal with null black pointer
-
-2000-01-13	<rlk@sourceforge.net>
-
-	Files:	print.c (1.38.2.2) (+3 -3)
-
-	Bump version
-
-2000-01-13	<rlk@sourceforge.net>
-
-	Files:	print.c (1.38.2.1) (+3 -3)
-
-	bump version
-
-2000-01-13	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.39.2.1) (+6 -3)
-
-	silliness
-
-2000-01-13	<rlk@sourceforge.net>
-
 	Files:	print-escp2.c (1.39) (+6 -3)
 
 	bug fix from mainline
@@ -26936,17 +35184,6 @@
 
 	Gimp merge
 
-2000-01-13	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.1.1.2) (+1546 -257)
-		print-pcl.c (1.1.1.2) (+214 -478)
-		print-ps.c (1.1.1.2) (+217 -126)
-		print-util.c (1.1.1.2) (+2057 -216)
-		print.c (1.1.1.5) (+1393 -368)
-		print.h (1.1.1.2) (+130 -43)
-
-	Update from the Gimp
-
 2000-01-09	<rlk@sourceforge.net>
 
 	Files:	weavetest.c (1.9) (+37 -13)
@@ -26955,7 +35192,9 @@
 
 2000-01-08	<rlk@sourceforge.net>
 
-	Files:	README (1.6) (+4 -5)
+	Files:	Makefile (1.10) (+3 -1)
+		Makefile.standalone (1.4) (+1 -1)
+		README (1.6) (+4 -5)
 		print-pcl.c (1.14) (+6 -3)
 		print-ps.c (1.12) (+6 -3)
 		print.c (1.37) (+3 -3)
@@ -27160,7 +35399,7 @@
 
 1999-12-10	<rlk@sourceforge.net>
 
-	Files:	weavetest.c (1.1) ( )
+	Files:	weavetest.c (1.1) (added)
 
 	.
 
@@ -27214,20 +35453,26 @@
 
 	stdplugins-intl.h is not a standard header file
 
-1999-11-25	<rlk@sourceforge.net>
+1999-11-27	<rlk@sourceforge.net>
 
-	Files:	print.c (1.28) (+44 -33)
+	Files:	Makefile (1.9) (+4 -4)
 
-	1.1.12 merge
+	.
 
-1999-11-25	<rlk@sourceforge.net>
+1999-11-27	<rlk@sourceforge.net>
 
-	Files:	print.c (1.1.1.4) (+44 -34)
+	Files:	Makefile (1.8) (+8 -5)
 
 	.
 
 1999-11-25	<rlk@sourceforge.net>
 
+	Files:	print.c (1.28) (+44 -33)
+
+	1.1.12 merge
+
+1999-11-25	<rlk@sourceforge.net>
+
 	Files:	print-util.c (1.33) (+91 -23)
 		print.c (1.27) (+6 -6)
 		print.h (1.19) (+3 -3)
@@ -27262,9 +35507,22 @@
 
 	First stage of simplifying the variable stuff
 
+1999-11-23	<rlk@sourceforge.net>
+
+	Files:	Makefile.standalone (1.3) (+1 -0)
+
+	Need Gimp includes, too
+
+1999-11-16	<rlk@sourceforge.net>
+
+	Files:	Makefile.standalone (1.2) (+2 -2)
+		README (1.4) (+4 -0)
+
+	.
+
 1999-11-16	<rlk@sourceforge.net>
 
-	Files:	README (1.4) (+4 -0)
+	Files:	Makefile.standalone (1.1) (added)
 
 	.
 
@@ -27296,7 +35554,7 @@
 
 1999-11-14	<rlk@sourceforge.net>
 
-	Files:	README (1.1) ( )
+	Files:	README (1.1) (added)
 		print-escp2.c (1.26) (+32 -12)
 		print-util.c (1.28) (+59 -41)
 		print.c (1.23) (+5 -2)
@@ -27366,6 +35624,12 @@
 
 1999-11-10	<rlk@sourceforge.net>
 
+	Files:	Makefile (1.7) (+1 -1)
+
+	-g really doesn't work very well with -O6
+
+1999-11-10	<rlk@sourceforge.net>
+
 	Files:	print-pcl.c (1.11) (+7 -4)
 
 	multi-pass
@@ -27422,7 +35686,14 @@
 
 1999-11-02	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.19) (+50 -54)
+	Files:	Makefile (1.6) (+36 -32)
+
+	1.1.11 merge
+
+1999-11-02	<rlk@sourceforge.net>
+
+	Files:	Makefile (1.5) (+2 -1)
+		print-escp2.c (1.19) (+50 -54)
 
 	Good weave code
 
@@ -27624,15 +35895,16 @@
 
 1999-10-07	<rlk@sourceforge.net>
 
-	Files:	print.c (1.7) (+52 -13)
+	Files:	Makefile (1.4) (+1 -1)
 
-	1.1.10 merge
+	.
 
 1999-10-07	<rlk@sourceforge.net>
 
-	Files:	print.c (1.1.1.3) (+52 -13)
+	Files:	Makefile (1.3) (+25 -18)
+		print.c (1.7) (+52 -13)
 
-	gimp 1.1.10
+	1.1.10 merge
 
 1999-10-06	<rlk@sourceforge.net>
 
@@ -27642,7 +35914,8 @@
 
 1999-10-03	<rlk@sourceforge.net>
 
-	Files:	print-escp2.c (1.4) (+25 -13)
+	Files:	Makefile (1.2) (+43 -31)
+		print-escp2.c (1.4) (+25 -13)
 		print-util.c (1.5) (+50 -20)
 		print.c (1.5) (+5 -5)
 
@@ -27680,13 +35953,8 @@
 
 1999-09-12	<rlk@sourceforge.net>
 
-	Files:	print.c (1.1.1.2) (+17 -18)
-
-	.
-
-1999-09-12	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.2) (+259 -24)
+	Files:	Makefile (1.1) (added)
+		print-escp2.c (1.2) (+259 -24)
 		print-pcl.c (1.2) (+3 -2)
 		print-ps.c (1.2) (+3 -2)
 		print-util.c (1.2) (+1051 -28)
@@ -27697,24 +35965,14 @@
 
 1999-09-12	<rlk@sourceforge.net>
 
-	Files:	Makefile.am (1.1) ( )
-		print-escp2.c (1.1) ( )
-		print-pcl.c (1.1) ( )
-		print-ps.c (1.1) ( )
-		print-util.c (1.1) ( )
-		print.c (1.1) ( )
-		print.h (1.1) ( )
+	Files:	Makefile.am (1.1) (added)
+		Makefile.in (1.1) (added)
+		print-escp2.c (1.1) (added)
+		print-pcl.c (1.1) (added)
+		print-ps.c (1.1) (added)
+		print-util.c (1.1) (added)
+		print.c (1.1) (added)
+		print.h (1.1) (added)
 
 	Initial revision
 
-1999-09-12	<rlk@sourceforge.net>
-
-	Files:	print-escp2.c (1.1.1.1) (+0 -0)
-		print-pcl.c (1.1.1.1) (+0 -0)
-		print-ps.c (1.1.1.1) (+0 -0)
-		print-util.c (1.1.1.1) (+0 -0)
-		print.c (1.1.1.1) (+0 -0)
-		print.h (1.1.1.1) (+0 -0)
-
-	1.1.8 baseline
-
diff --git a/Makefile.in b/Makefile.in
index 55d7dbd..4871fbe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -265,6 +268,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -591,7 +595,7 @@ distdir: $(DISTFILES)
 	esac
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/include/gutenprint $(distdir)/m4 $(distdir)/man $(distdir)/po $(distdir)/scripts $(distdir)/src/cups $(distdir)/src/foomatic $(distdir)/src/gutenprintui $(distdir)/src/gutenprintui2 $(distdir)/src/main
+	$(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/include/gutenprint $(distdir)/m4 $(distdir)/man $(distdir)/po $(distdir)/scripts $(distdir)/src/cups $(distdir)/src/foomatic $(distdir)/src/gutenprintui $(distdir)/src/gutenprintui2 $(distdir)/src/main $(distdir)/src/testpattern
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -827,9 +831,6 @@ uninstall-info: uninstall-info-recursive
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/NEWS b/NEWS
index 0ab7062..6a4d100 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.0.0-rc2!  Please read these release notes
+Welcome to Gutenprint 5.0.0-rc3!  Please read these release notes
 carefully.
 
 Gutenprint, formerly named Gimp-Print, is a suite of printer drivers
@@ -19,46 +19,103 @@ important) piece 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.0-rc2 is the second release candidate of Gutenprint
-5.0, and incorporates extensive feedback from the first release
-candidate.  It is based on the Gimp-Print 4.3 series that has been in
-development for over three years, and includes many improvements over
-the very popular 4.2 series.  This release is believed to be quite
-stable, but further testing is required before final release.  We
-believe this release to be stable enough for day to day use, and
-encourage people to test it and report their results.
-
-Gutenprint currently contains over 200 drivers supporting in excess of
-700 printer models.
-
-The CUPS driver requires CUPS 1.1.15 or higher.  If you wish to build
-this from source, you may need to install a package named "cups-devel"
-or something similar.  Please the rest of the release notes, in
-particular the Exceptions and Workarounds, for full details on
-installation, as there is important information to be aware of.  CUPS
-is the printing system used on Macintosh OS X 10.2 and above, and many
-other systems use it.  The combination of CUPS and Gutenprint provides
-a flexible, general purpose printing system capable of producing the
-highest quality output with any of the printers supported by this
-package.  We strongly recommend using CUPS with Gutenprint as a
-general-purpose printing solution.
+Gutenprint 5.0.0-rc3 is the third release candidate of Gutenprint 5.0,
+and incorporates extensive feedback from the first release candidate.
+It is based on the Gimp-Print 4.3 series that has been in development
+for over three years, and includes many improvements over the very
+popular 4.2 series.  This release is believed to be quite stable, but
+further testing is required before final release.  We believe this
+release to be stable enough for day to day use, and encourage people
+to test it and report their results.
+
+Gutenprint currently supports over 700 printer models.
+
+These release notes contain the following sections:
+
+I)    General Requirements
+II)   Changes from Previous Releases
+	A) Changes from 5.0.0-rc2 to 5.0.0-rc3
+	B) Changes from 5.0.0-rc1 to 5.0.0-rc2
+III)  Overall changes from 4.2 to 5.0.
+	A) General user-visible changes
+	B) New Functionality
+	C) Changes to the Print plugin for the GIMP
+	D) Changes to the CUPS interface
+	E) Changes to the Ghostscript driver
+	F) Changes to the Foomatic data generator
+	G) Quality improvements
+	H) Architectural Changes
+IV)   Exceptions and Workarounds
+	A) General Issues
+	B) Build/Installation Issues
+V)    Supported Printers
+	A) List of Supported Printers
+	B) Printer-specific notes
+VI)   List of supported options
+	A) Basic Printer Options
+	B) Advanced Printer Options
+	C) Specialized Printer Options
+	D) Basic Output Controls
+	E) Basic Output Adjustments
+	F) Advanced Output Adjustments
+	G) Output Density (Ink Quantity) Controls
+	H) Gray Balance Controls
+	I) Output Gamma Controls
+	J) Gray Generation Controls
+	K) Output Linearization Curves (GIMP Plugin Only)
+	L) Detailed Color Correction Curves (GIMP Plugin Only)
+	M) Specialized Output Controls
+	N) Transition Controls
+	O) Foomatic-Only Options
+
+
+================================================================
+
+I) GENERAL REQUIREMENTS
+
+Gutenprint will run on any reasonably modern computer running Linux,
+Macintosh OS X (10.2 or above), Solaris, or any other UNIX-like
+operating system.  If you plan to compile this package from source,
+you will also need an ANSI C compiler, such as gcc (recommended).  A
+compiler is not required if you are installing a pre-compiled package.
+
+Processor and memory requirements vary depending upon the printer and
+runtime options selected; it is suggested that you have at least 64 MB
+of memory for general purpose printing, 256 MB or more for high
+quality printing on a good printer, and 1 GB or more for large format
+printing at high resolution.  You should have at least 50 MB of free
+disk space to compile and install Gutenprint.  Disk space requirements
+for printing will vary depending upon how you use Gutenprint, but are
+generally modest except as noted below.  We recommend a processor
+speed of at least 300 MHz.  Fast printers may require a faster
+processor to achieve maximum printing speed.
+
+For general use, you should have the Common UNIX Printing System, CUPS
+(version 1.1.15 or above) or Foomatic (2.0 or above) installed.
+Please the rest of the release notes, in particular the Exceptions and
+Workarounds, for full details on installation, as there is important
+information to be aware of.  CUPS is the printing system used on
+Macintosh OS X 10.2 and above, and many other systems use it.  The
+combination of CUPS and Gutenprint provides a flexible, general
+purpose printing system capable of producing the highest quality
+output with any of the printers supported by this package.  We
+strongly recommend using CUPS with Gutenprint as a general-purpose
+printing solution.
 
 The 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), or the GIMP
-2.0 or above.  You may need to install packages named "gimp-devel",
-"gtk-devel", and "glib-devel" (or similar equivalents) on many
-systems.  For GIMP 2.0, you may need to install "gimp2-devel",
-"gtk2-devel", "glib2-devel", and possibly other packages as well.
-This plug-in will work with any printing system, and offers a
-comprehensive user interface to control all aspects of the printing
-process.
+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 Ghostscript driver requires GNU Ghostscript 6.53 or higher, ESP
 Ghostscript 7.05 or higher, or AFPL Ghostscript 7.04 or higher.  It
 uses the IJS package included with these versions of Ghostscript to
 create a driver that may be built much more easily than traditional
-Ghostscript drivers.  The options for this driver are very complex,
-and it is normally used with the Foomatic driver integration system.
+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.
@@ -68,28 +125,215 @@ 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), as those systems do not use CUPS as their
-printing system.  This is NOT going to be fixed; you must upgrade to
-at least OS X 10.2 in order to use this package.  The reason why is
-that OS X 10.2 and above use CUPS as the basis of the printing system.
-OS X 10.0 and 10.1 use a different system that would require a
-separate driver, and we do not plan to write that driver.
+10.1 (such as 10.1.5).  The printing system used with these versions
+of OS X is not compatible with Gutenprint.  OS X 10.2 and above use
+CUPS as the basis of the printing system, which is compatible with
+Gutenprint.
 
 The README file included with this package provides full instructions
 for building and installing Gutenprint.
 
-These release notes contain the following sections:
-
-1) Changes from 5.0.0-rc1 to 5.0.0-rc2
-2) Overall changes from 4.2 to 5.0.
-3) Known build/installation issues
-4) List of supported printers
-5) Printer-specific notes
 
 ================================================================
 
-* Major changes between Gutenprint 5.0.0 release candidate 1 and
-  Gutenprint 5.0.0 release candidate 2:
+II) MAJOR CHANGES FROM PREVIOUS RELEASES
+
+A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
+   GUTENPRINT 5.0.0 RELEASE CANDIDATE 3:
+
+  1) The package now offers explicit support for many more printers.
+     All printers supported by Gutenprint are now listed explicitly
+     rather than via the compatibility list.  As a result, CUPS PPD
+     files and Foomatic are now generated for each supported printer.
+
+  2) CUPS and Foomatic/IJS now produce correctly dimensioned and
+     positioned output.  Previous pre-releases of Gutenprint 5.0
+     produced incorrectly dimensioned and/or positioned (offset from
+     the correct position) output in certain cases.  This happened in
+     the following circumstances:
+
+     a) When a printer capable of optional full-bleed or borderless
+	operation was used in full-bleed/borderless mode, the output
+	was stretched to fit the expanded dimensions.  The result was
+	that lines of specified lengths were printed slightly longer
+	than desired, and since the vertical and horizontal stretching
+	was normally not identical, the output was distorted slightly.
+
+     b) When printing directly to a CD, the output was shrunk
+	horizontally and/or positioned incorrectly by a small amount
+	(typically a few mm).
+
+     c) Depending upon the application doing the printing and the
+	printer selected, the output was shifted down and to the right
+	by several mm.
+
+     The PPD files and driver have been modified to specify zero
+     borders in all cases when a printer with borderless capability is
+     used.  If normal (non-borderless) mode is selected, the border is
+     simply not printed, leaving correct dimensions for everything
+     within the imageable area.  However, as a result of this, the
+     driver no longer prints true full bleed (overprinting the edge of
+     the page).  The margins are set to zero, and typically there will
+     be very narrow unprinted margins (less than 1 mm) on one or more
+     sides.
+
+     Printing to CD's works correctly whether or not full bleed mode
+     is selected.
+
+     This change has no effect in the GIMP plugin and in other
+     applications which directly use Gutenprint, as there was never
+     any problem in those contexts.
+
+  3) The IJS driver now correctly ejects the last page of a job.
+     Previously it did not always eject the last page with certain
+     Epson printers.
+
+  4) The Epson Stylus Photo R800, R1800, R2400, and related printers
+     should now print at full speed in all cases.  Previously these
+     printers were extremely slow (about 10 times slower than normal)
+     in many cases.
+
+     Related to this, the list of resolutions offered for these
+     printers are slightly different from before.  Resolutions above
+     2880x1440 DPI are no longer offered; instead, resolutions of
+     2880x1440 high quality and 2880x1440 highest quality are offered.
+     These resolutions use extra passes of the print head to reduce
+     banding.  In addition, these resolutions are actually 1440 DPI
+     horizontally and 2880 DPI vertically.
+
+  5) The HP DeskJet 690 and other supported PCL printers capable of
+     6-color photo printing (such as the Apollo P-2100 and Apple Color
+     StyleWriter 4500) no longer result in the driver crashing if
+     black and white output mode was selected.  Also, Canon printers
+     capable of 6 or 7 color photo printing no longer result in a
+     crash if black and white output mode is selected.
+
+  6) Canon and Lexmark inkjet printers now print if color output mode
+     is selected with a black and white cartridge installed.
+     Previously this was not possible in the GIMP plugin; the CUPS and
+     Foomatic drivers permitted this to be set, but gave a runtime
+     error when a job with these settings was printed.  These printers
+     now accept the job and simply print it in black and white.
+
+  7) The cleaning and nozzle check functions of escputil now work
+     properly on most printers, and escputil no longer crashes if you
+     type ctrl-D to a command prompt.  In addition, the status printed
+     via the status command is now much more readable.
+
+  8) The color quality for the Epson R300, R800, R2400, and related
+     printers has been improved.
+
+  9) Raw output now works correctly on the Epson R800 and R1800.
+
+  10) The Canon driver now handles color and grayscale, and also photo
+     ink cartridges (previously it sometimes handled these incorrectly
+     or even crashed).  However, many of these printers still do not
+     print correctly with a photo cartridge installed (the width of
+     the printout is incorrect).
+
+  11) The GIMP plugin now displays the thumbnail image correctly in CMY
+     mode (previously it displayed incorrect colors).
+
+  12) Experimental support for the Japan-market Epson printers PM-A900,
+     PM-D800, PM-G730, and PX-V630, and preliminary support for the
+     PM-A650, PM-A750, and PM-A890.
+
+  13) The definition of the Epson Stylus CX3500, CX3600, CX3650,
+     CX4100, CX4200, CX4500, CX4600, CX4700, CX4800, CX5700, CX5800,
+     CX7700, CX7800, DX4200, DX4250, DX4800, and PX-A650 have been
+     corrected.  The DX4800 now works correctly; the color output for
+     all of these printers has been corrected.  All of these printers
+     also now print at full speed; they previously printed extremely
+     slowly in many cases.
+
+     The list of resolutions is also slightly different from before;
+     the 2880x1440 DPI resolution is no longer offered; instead,
+     resolutions of 1440x1440 high quality and 1440x1440 highest
+     quality are offered.  These resolutions use extra passes of the
+     print head to reduce banding.
+
+  14) A new option for generating simplified PPD files for CUPS has
+     been added.  The --enable-simplified-cups-ppds=yes option to
+     configure allows generating PPD files with only basic options
+     (including only common paper sizes) in addition to the normal,
+     full-featured PPD files; --enable-simplified-cups-ppds=only
+     generates only the simplified PPD files.  The -a and -s options
+     to cups-genppd.5.0 may be used manually to do the same thing.
+     This is discussed in the README file.
+
+  15) cups-genppdupdate.5.0 has significant enhancements:
+
+     * A new option, -N, causes cups-genppdupdate.5.0 to not merge
+       options from the old PPD file into the new file.  This can be
+       used to reset a CUPS+Gutenprint PPD file to its original state.
+
+     * A new option, -o, causes cups-genppdupdate.5.0 to output the
+       PPD files into a different directory.
+
+     * It is now possible to specify individual PPD files or printer
+       queue names on the command line to only update/reset specific
+       PPD files.
+
+     * The program no longer tries and fails to update Foomatic-based
+       PPD files.
+
+  16) The Foomatic data generator now generates simplified data (using
+     a driver name of "gutenprint-ijs-simplified.5.0") in addition to
+     the standard, full-featured data (gutenprint-ijs.5.0).
+
+  17) The input slots (media sources) have been corrected for the
+     Epson Stylus Photo R1800, R2400, and RX700.
+
+  18) New options to escputil allow specifying the number of line pairs
+     and number of patterns for head alignment explicitly, if needed.
+     In addition, the number of line pairs for the Epson Stylus Photo
+     700 has been changed from 7 to 15.
+
+  19) A few build problems have been fixed.
+
+  20) A Hungarian translation has been added.
+
+  21) The configure script now prints out a summary of configuration
+     options selected at the end of the script run.  For developers,
+     "autogen.sh --help" now prints out the configure help if the
+     configure script exists.
+
+  22) The Lexmark driver should now print correctly (this is only
+     partially tested).
+
+  23) Chilean Office, Chilean Double Letter, and Chilean Double Office
+     paper sizes have been added.
+
+  24) An error in the Czech, Danish, and Portuguese translations that
+     caused the GIMP plugin to emit a warning at startup has been
+     fixed.
+
+  25) The package is now built with libtool 1.5.22.
+
+The following bugs have been fixed since Gutenprint 5.0.0-rc3:
+
+1318890 Borderless print scaled wrongly
+1379402 BJC-4400: SEGFAULT (photo-ink/color mode)
+1393755 [Feature Request] Chilean paper sizes.
+1417600 escputil clean and nozzle check don't work on new printers
+1417603 escputil seg faults if you type ctrl-D to prompt
+1421674 Gutenprint 5.0.0rc2 crashes in Mac OS X 10.2.8
+1422101 Raw output does not work on R800 and related printers
+1425951 Bug#351731: Fails in alignment with stylos photo 700
+1447115 Epson driver broken in RC2 (DX4850)
+1458059 Lexmark Z52 not working
+1458911 Very poor performance with Epson R2400, R800, and R1800
+1466678 Epson Stylus Photo R300 fails to eject last page
+1467956 Print to CD prints incorrectly with CUPS driver
+1478819 bad translation format
+1487715 HP DeskJet 690 and related crash in grayscale w/photo ink
+1487717 Canon/Lexmark printers fail in color mode w/BW inks
+1487720 Canon printers crash in grayscale with photo ink 
+
+----------------
+
+B) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 1 AND
+   GUTENPRINT 5.0.0 RELEASE CANDIDATE 2:
 
   1) The Postscript driver now produces more accurate colors.
      Previous releases produced overly pale colors with the default
@@ -113,7 +357,7 @@ These release notes contain the following sections:
      Related to this, the CUPS driver now handles Quality properly.
 
   5) A description of all options supported by Gutenprint has been
-     added, in doc/gutenprint-options.
+     added.
 
   6) cups-genppdupdate now preserves the ownership and permissions of
      the PPD files being updated, rather than forcibly setting the
@@ -204,17 +448,13 @@ The following bugs have been fixed in Gutenprint 5.0.0-rc2:
 
 ================================================================
 
-Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
+III) OVERALL CHANGES BETWEEN GIMP-PRINT 4.2 AND GUTENPRINT 5.0:
 
-* General User-Visible Changes:
+A) GENERAL USER-VISIBLE CHANGES:
 
-  1) In general, Gutenprint 5.0 is very different from Gimp-Print 4.2.
-     Gutenprint 5.0 offers many new options (which are described
-     separately below), and many options that are present in both 4.2
-     and 5.0 function differently in the two releases.  In addition,
-     the API is different.  Finally, the color correction is quite
-     different, and profiles created with the 4.2 driver will not
-     function well with the 5.0 driver.
+  1) Gutenprint offers many new options, which are described
+     separately below.  Many other options that are present in both
+     4.2 and 5.0 function differently between the two releases.
 
   2) Options in the CUPS driver and GIMP plugin are now grouped
      according to function.  This work is still in progress, and
@@ -269,6 +509,14 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      their own linearization and ink limiting may wish to use the Raw
      color correction mode, which does not adjust the density.
 
+     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.
+
   6) The old man pages, and src/ghost/README, have been withdrawn.
      These pages, and the Ghostscript README file, were based on the
      Gimp-Print 4.2 options, which were much less extensive than the
@@ -283,7 +531,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      and consumes a significant amount of space in the installation.
 
 
-* New Functionality:
+----------------
+
+B) NEW FUNCTIONALITY:
 
   1) This release offers a new "curve" data type, permitting very
      precise adjustments of output.  Currently the curves are only
@@ -345,6 +595,11 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      CD.  This fine adjustment setting is not available in the
      Foomatic interface at present.
 
+     To print to a CD, you need to select the "Print to CD" media
+     source (input slot).  You must also select the appropriate page
+     size (3" CD or 5" CD).  Note that this is different from the
+     instructions Epson provides, which specify A4 media size.
+
   9) The Epson driver now offers a choice of print head weave
      patterns.  In addition to simplifying the resolution choices for
      Epson Stylus Pro printers, this offers an additional control for
@@ -416,6 +671,10 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
        older printers, it simply returns the standard ink
        information.
 
+     * The status command now prints status in a human-readable format
+       rather than simply reporting the raw information returned by
+       the printer.
+
      * Ink level detection now works on all known supported printers,
        and may work on other non-supported printers.  Previously it
        did not work on some newer printers.  However, it is somewhat
@@ -446,7 +705,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      option is not normally required and is disabled by default.
 
 
-* Changes to the Print plugin for the GIMP:
+----------------
+
+C) CHANGES TO THE PRINT PLUGIN FOR THE GIMP:
 
   1) A new plugin for the GIMP 2.x is now provided.
 
@@ -480,7 +741,10 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      what's being printed, enabling and disabling options as
      appropriate.
 
-  8) If you are using an older version of the GIMP 1.2, and the GIMP
+  8) The plugin now lists printers grouped by manufacturer, rather
+     than a single long list.
+
+  9) If you are using an older version of the GIMP 1.2, and the GIMP
      is installed in a non-standard location on your system such that
      you cannot run configure in Gutenprint without using
      --with-gimp-prefix or --with-gimp-exec-prefix, please read item
@@ -489,7 +753,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      system, you should read the same material.
 
 
-* Changes to the CUPS driver:
+----------------
+
+D) CHANGES TO THE CUPS INTERFACE:
 
   1) The CUPS PPD files now offer both fine and coarse adjustments for
      all color controls, permitting much finer control over output (in
@@ -515,7 +781,26 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      files based on Gimp-Print 4.2, or Gimp-Print 4.3 releases prior
      to 4.3.21.
 
-  5) The CUPS driver now offers 16-bit printing as an option with ESP
+  5) On printers capable of borderless output, the CUPS driver now
+     advertises (via the *ImageableArea in PPD files) the full page
+     dimension, and crops the output if the borderless mode is not
+     selected.  If borderless mode is selected, the full image (up to
+     the limits of the printer) will be printed.
+
+     This compromise is necessitated by the fact that PPD files can
+     only supply a single imageable area for a particular page size,
+     so it was necessary to select which imageable area to provide.
+     In early prereleases of Gutenprint 5.0, we supplied the normal
+     page area, and stretched the output if the user selected full
+     bleed.  This caused problems for many users, in that it was not
+     possible to print the full surface of the paper while preserving
+     dimensions.
+
+     Based on user feedback, we determined that the best solution is
+     to provide the full page size as the imageable area and crop the
+     result if full bleed mode is not selected.
+
+  6) The CUPS driver now offers 16-bit printing as an option with ESP
      Ghostscript 8.15, and Apple Macintosh OS X 10.4 ("Tiger"), using
      the new Color Precision control.  Setting Color Precision to
      "Best" enables 16-bit printing if the system supports it; setting
@@ -529,7 +814,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      highlights where it might be visible with 8-bit color
      computation.  It may be somewhat slower than 8-bit printing.
 
-  6) Due to the implementation of CUPS, it is necessary on some
+  7) Due to the implementation of CUPS, it is necessary on some
      systems to link the programs associated with the CUPS driver (in
      particular, cups-genppd and rastertogutenprint) statically
      against the Gutenprint library.  Please see bugs 865253 and
@@ -544,7 +829,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      procedure.
 
 
-* Changes to the Ghostscript driver:
+----------------
+
+E) CHANGES TO THE GHOSTSCRIPT DRIVER:
 
   1) The stp driver, a monolithic (traditional) Ghostscript driver
      used with Ghostscript 5.10, 5.50, and 6.51, has been withdrawn.
@@ -571,7 +858,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      with AFPL Ghostscript with no license conflict.
 
 
-* Changes to Foomatic data generation:
+----------------
+
+F) CHANGES TO FOOMATIC DATA GENERATION:
 
   1) The Ghostscript IJS driver now functions only with Foomatic PPD
      files created for the matching version of Gutenprint, providing
@@ -587,8 +876,29 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      permitting a parallel installation or gradual switchover between
      4.2 and 5.0-based releases.
 
+  3) On printers capable of borderless output, the Foomatic driver now
+     advertises (via the *ImageableArea in PPD files) the full page
+     dimension, and crops the output if the borderless mode is not
+     selected.  If borderless mode is selected, the full image (up to
+     the limits of the printer) will be printed.
+
+     This compromise is necessitated by the fact that PPD files can
+     only supply a single imageable area for a particular page size,
+     so it was necessary to select which imageable area to provide.
+     In early prereleases of Gutenprint 5.0, we supplied the normal
+     page area, and stretched the output if the user selected full
+     bleed.  This caused problems for many users, in that it was not
+     possible to print the full surface of the paper while preserving
+     dimensions.
 
-* Quality Improvements:
+     Based on user feedback, we determined that the best solution is
+     to provide the full page size as the imageable area and crop the
+     result if full bleed mode is not selected.
+
+
+----------------
+
+G) QUALITY IMPROVEMENTS:
 
   1) Color and tonal accuracy is greatly improved compared to 4.2
      while the gamut (range of printable colors) has been increased.
@@ -669,7 +979,159 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      darker black on all paper types.
 
 
-* Exceptions and Workarounds:
+----------------
+
+H) ARCHITECTURAL CHANGES:
+
+  1) Family drivers are now modular.  A "family driver" is a
+     collection of printer drivers for one group of printers sharing a
+     common programming architecture, e. g. ESC/P2, PCL, Lexmark,
+     Canon.  The drivers can be built as separate modules and loaded
+     at runtime as needed.
+
+  2) Color processing is now partially modularized.  This architecture
+     will enable us, or others, to provide color management without
+     having to change the internal interfaces within Gutenprint.
+
+  3) New composite data types.  Gutenprint 5.0 defines additional data
+     types.  These types include:
+
+     * Sequences, curves, and arrays.  A sequence is a primitive
+       vector of numbers data type; curves and arrays provide
+       additional capabilities such as interpolation (for curves) and
+       multiple dimensions (for arrays).
+
+     * Lists are a general ordered container of named objects of
+       arbitrary type.  They are used throughout the core library in a
+       variety of ways.  The creator of a list can specify
+       constructor, destructor, name comparison, copy, and sort
+       operations on list members.
+
+     * Parameters, which are part of the options system described
+       below.  In addition to storing values and descriptions of the
+       parameter, parameters can be queried to determine defaults and
+       constraints.  Parameter lists (which use the list container
+       internally) are also defined as part of this.
+
+     * String lists are used in various ways; in particular, they are
+       used by the parameter system to inform programs of the
+       available choices of values for string-valued parameters.
+
+  4) Complete overhaul of the options system.  Rather than offering a
+     fixed set of operations, family drivers, color modules, etc. can
+     now offer a wide variety of options using a predefined set of
+     data types.  The data types currently supported are strings
+     picked from a list, floating point numbers, integers, curves,
+     arrays, Boolean values, dimensions, and filenames.
+
+     The new options system provides a flexible way for drivers to
+     inform applications of default values and UI hints, the ability
+     to selectively enable and disable options, and a generalized way
+     of verifying legality of option choices.
+
+  5) The coordinate system has been changed from bottom left to top
+     left of the page, and the printable area can now extend beyond
+     the edge of the page.  The result is a more intuitive coordinate
+     system for driver writers that matches the coordinate system of
+     printers, and the ability to do true full bleed.
+
+  6) The specification of color correction, input, and output modes
+     has been completely revised, permitting applications to specify
+     input mode, output mode, channel bit depth, and color correction
+     completely independently.  This architecture is also more
+     extensible.
+
+  7) Complete overhaul of the black generation in CMYK output.  Black
+     generation is now performed in the color code rather than the
+     dither code.  This simplifies the dither code, puts the CMYK
+     generation where it should be, and improves overall flexibility.
+
+  8) Complete overhaul of the multi-tone (photo or quadtone) ink
+     processing architecture (channels).  Instead of being processed
+     as part of the dithering code as in 4.2, where ink drops of
+     lighter inks were assigned virtual values proportional to their
+     darkness as well as their size, this is now processed after the
+     initial color conversion.  This has a number of major advantages:
+
+     * As the actual amount of ink to be printed is visible to the
+       color code, the color code can do ink limiting without fear
+       that the dither code will change the amount of ink to be
+       printed.
+
+     * It ensures that the same proportions of inks will be printed at
+       any density and resolution.  In 4.2, the ramp from light to
+       dark ink varied depending upon the dot sizes available and
+       hence the resolution.  This has already been demonstrated to
+       yield much better linearity and much more neutral gray scale
+       with even very modest tuning effort.
+
+     * It enables use of all drop sizes of all ink tones.  In 4.2, we
+       could not use the smallest drop size of dark ink, because the
+       virtual dot size of a small dot of dark ink is typically close
+       to the virtual dot size of a large dot of small ink.  This
+       would yield very sharp transition, and perhaps even result in
+       more light ink printed in darker regions than in lighter
+       regions.  With channel processing separate from dithering, this
+       concern no longer exists; we can safely use small drops of dark
+       ink, improving smoothness.
+
+     * It enables the color code to do ink limiting intelligently
+       without concern that the dither code will rearrange things
+       behind its back.
+
+     * It greatly simplifies the specification of inks.  With drop
+       size and darkness orthogonal, family drivers can greatly
+       simplify their tables of inks.
+
+     * Dither algorithms can choose to ignore smaller drop sizes if
+       they wish to offer fast operation.
+
+     * Applications with special requirements can now access the raw
+       ink channels directly.  This facility was used to create a
+       mechanism to more accurately tune printer inks.
+
+  9) The color system can now generate arbitrary ink colors, lifting
+     the CMYK-only restriction in previous versions of the package.
+     This permits full support for the Epson Stylus Photo R800 and
+     R1800, which use red and blue ink in addition to the traditional
+     CMYK.
+
+  10) Use of true XML to store data about printers and paper sizes, and
+     to represent new data types (sequences, curves, and arrays).
+     This uses the "mxml" XML library, a fast, lightweight XML parser
+     written by Mike Sweet for this project.  Currently, the use of
+     XML (as opposed to compiled-in data) is limited, but we expect
+     that this will change beyond the initial 5.0 release.
+
+  11) In addition to parameters, internal components such as family
+     drivers, color drivers, etc. can store arbitrary data in the
+     basic stp_vars_t object.  This facility is used to simplify the
+     internal driver API; the family driver no longer needs to keep
+     track of dither, color, etc. information itself.
+
+  12) The Epson Stylus family driver has been decomposed into more
+     functionally distinct units.  The data schema has been
+     considerably improved, and the code itself broken into more
+     easily maintained units.
+
+  13) The build system has been updated with a more contemporary
+     toolchain based on autoconf 2.5 and gettext 0.11.
+
+  14) The Print plugin for the GIMP has been decomposed into a UI
+     library and the core plugin.  The user interface library is a
+     pure GTK-based library; the tiny GIMP plugin is a client of this
+     library.
+
+  15) Printer characteristics are exposed to the application level as
+     read-only parameters.  This permits the escputil utility to not
+     duplicate information stored in the printer driver.
+
+
+================================================================
+
+IV) EXCEPTIONS AND WORKAROUNDS
+
+A) GENERAL ISSUES
 
   1) Full bleed mode does not work completely correctly on most Epson
      printers at present.  Typically there is a small margin at the
@@ -690,19 +1152,23 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      most cases) or Bright color correction.  It is possible that this
      release will not be able to drive some printers at full speed,
      particularly if your computer has a slow processor.  Performance
-     has been only partially analyzed or tuned at present.  We hope to
-     improve the performance prior to final release.
+     has been only partially analyzed or tuned at present.
 
   5) The user's manual and developer's guide have not been updated for
      this release.
 
-  6) With certain versions of CUPS and in certain non-default
+
+----------------
+
+B) BUILD/INSTALLATION ISSUES
+
+  1) With certain versions of CUPS and in certain non-default
      configurations, if a new version of Gutenprint is installed over
      an existing version genppd will create PPD files based on the
-     older version of Gutenprint or Gimp-Print rather than the newer
-     version.  This will happen if all of the following are true:
+     older version of Gutenprint rather than the newer version.  This
+     will happen if all of the following are true:
 
-     1) The cups-config provided by the CUPS driver adds
+     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
@@ -714,12 +1180,12 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
         "RUN_PATH", or the like.  This is controlled by the CUPS
         installation on your system.
 
-     2) There is presently a version of Gutenprint installed in /usr
+     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.
 
-     3) Gutenprint is built dynamically only (--disable-static).  This
+     iii) Gutenprint is built dynamically only (--disable-static).  This
         is not a default, and requires the explicit --disable-static
         on the Gutenprint "configure" command line.  Therefore, if you
         build Gutenprint normally you should not be vulnerable to this
@@ -735,7 +1201,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      In this case, the run path embedded in the genppd executable
      points to the version of Gutenprint installed in /usr/lib. This
      run path overrides any attempt by libtool to look in the build
-     directory. The result is that cups-genppd and rastertogimpprint
+     directory. The result is that cups-genppd and rastertogutenprint
      are run against the older version of Gutenprint. If the new
      version contains additional features (more printers, etc.) they
      will not be available.
@@ -754,21 +1220,161 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      (because cups-config --ldflags sets the run path), there are
      three workarounds available:
 
-     1) Build and install Gutenprint into /usr (rather than
+     i) Build and install Gutenprint into /usr (rather than
         /usr/local) and then rebuild Gutenprint from scratch.  This
-        will install the correct libgimpprint.so in /usr/lib, and in
+        will install the correct libgutenprint.so in /usr/lib, and in
         the rebuild genppd will be run against the correct library.
 
-     2) Remove the old version of Gimp-Print or Gutenprint prior to
-        building the new version of Gutenprint.  The important files
-        to remove are anything named /usr/lib/libgimpprint*.
-
-     3) Edit cups-config to remove the reference to the run path.
-
-  7) There are multiple issues that one must be aware of when using
+     ii) Remove the old version of Gutenprint prior to building the
+        new version of Gutenprint.  The important files to remove are
+        anything named /usr/lib/libgutenprint*.
+
+     iii) Edit cups-config to remove the reference to the run path.
+
+  2) There is a known translation problem building the PPD files used
+     by the CUPS driver such that on many systems all of the PPD
+     files are in the English language.  This causes CUPS tools, such
+     as KUPS or http://localhost:631 to display many copies of each
+     PPD file, all in the English (en) language.  In fact, the PPD
+     files should be translated into many different languages.
+
+     The PPD files are created by a program named "genppd" in the
+     src/cups directory.  This program is called once for each
+     language, and creates all of the PPD files for the language in
+     one shot.
+
+     The command 'zgrep' can be used to determine if genppd is
+     creating the PPD files correctly, as follows:
+
+	 src/cups$ zgrep LanguageVersion ppd/*/pcl-4.ppd.gz
+	 ppd/C/pcl-4.ppd.gz:*LanguageVersion: English
+	 ppd/da/pcl-4.ppd.gz:*LanguageVersion: Danish
+	 ppd/en_GB/pcl-4.ppd.gz:*LanguageVersion: English-GB
+	 ...
+
+     If the PPD file for each language has a different language
+     version, the genppd program operated correctly.  If instead the
+     output looks like this:
+
+	 src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd.gz
+	 ppd/C/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
+	 ppd/da/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
+	 ppd/en_GB/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
+	 ...
+
+     the program did not operate correctly.
+
+     If you do not have 'zgrep' on your system, you can gunzip the
+     PPD files, and use
+
+	 grep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd
+
+     to accomplish the same test.
+
+     The normal mechanism for performing translations is to set the
+     LANG environment variable to the appropriate language prior to
+     running the program.  This normally causes the program to search
+     the translations (normally in /usr/share/locale or
+     /usr/lib/locale) for the chosen language.  When a specially
+     marked string is used, a special macro calls `gettext()' on the
+     string to retrieve the translation, and substitutes the
+     translation for the string in question.
+
+     There are two problems with this approach in the context of
+     genppd.  The translation engine is intended to be used after
+     installation, not during build, and this causes problems.
+
+     i) At the time genppd is run, the translations have not been
+	installed in the normal system directories.  Fortunately,
+	it's possible to tell the translation machinery (via
+	bindtextdomain) to look elsewhere for the translation
+	catalogs.  What we do is install the catalogs in a temporary
+	directory under src/cups, and tell genppd to instruct the
+	translation machinery to look there.  This workaround is
+	straightforward, and doesn't normally cause problems.
+
+     ii) LANG only lets us pick a valid locale (normally determined by
+	listing the directories in /usr/share/locale or
+	/usr/lib/locale).  Unfortunately, while language codes (which
+	form the base of locales) are standard, the actual locale
+	names aren't always.  On some systems, the locale names are
+	just the language base names; on others, they are the
+	language names concatenated with country codes (e. g. en_US),
+	while on others they are language codes concatenated with
+	character sets.  We are not aware of any workaround for this,
+	possibly short of actually running make install and then
+	rebuilding the PPD's.  'make install' will install the
+	message catalogs, and that may create the necessary locale
+	directories.  This is not exactly a very elegant approach.
+
+     The GNU gettext library (libintl.a) provides another environment
+     variable, LANGUAGE, which unconditionally looks up translations
+     according to the language, ignoring LANG and the LC_*
+     environment variables that are normally used for translation.
+     This library is no longer included with Gutenprint
+     (--with-included-gettext will not work).  Install the GNU
+     gettext package first if you need libintl.a.  Many systems
+     provide translation machinery in their standard libraries, and
+     it may not always be best to use foreign libraries to replace
+     standard system functionality.
+
+     We have chosen to use LANGUAGE for this purpose, as the GNU
+     gettext library appears to offer the most reliable translation,
+     and LANGUAGE appears to offer the most reliable mechanism.  We
+     have actually found that LANG and LC_* can interfere with
+     LANGUAGE, thus we do not use both.
+
+     To determine if the translations are working, you must actually
+     inspect the PPD files.  You will need to
+
+     cd src/cups/ppd/sv
+     gunzip *
+     more *
+
+     or the like to determine if this is successful.  In particular,
+     look for LanguageVersion, and make sure that it is correct (it
+     should be "Swedish" in the sv directory, for example), and also
+     make sure that the paper sizes are also translated.  We
+     currently suggest using the Swedish translation for this purpose
+     as it is the most complete.
+
+     If packagers find that the PPD files are all in English, rather
+     than translated into the appropriate languages, we suggest the
+     following:
+
+     i) Install GNU gettext (libintl).  If your system is not based
+	on GNU libc (Linux usually is based on GNU libc; BSD,
+	Solaris, IRIX, etc. are not), you will need this to have any
+	possibility of creating the translated PPD files.
+
+     ii) Run 'make install' to install the package (including the
+	message catalogs) onto the system first, and then do the
+	following:
+
+	cd src/cups
+	rm ppd-stamp
+	make
+
+	to rebuild the PPD files.  Having the message catalogs on the
+	system may permit this to succeed.
+
+     iii) Ensure that your system actually has locales named 'sv',
+	'pl', and all of the other supported languages, and change
+	LANGUAGE to something more appropriate (most likely LANG,
+	LC_MESSAGES, or LC_ALL).
+
+     iv) Build the PPD files on a Linux-based system; they are
+	portable.
+
+     v) Use --disable-translated-cups-ppds on the configure command line
+	to suppress the translated PPD files altogether.
+
+     Please feel free to contact us about this issue.
+
+  3) There are multiple issues that one must be aware of when using
      Foomatic with Gutenprint.
 
-     1) Before installing any new release of Gutenprint 5.0, you must
+     i) Before installing any new release of Gutenprint 5.0, you must
 	manually remove any existing Foomatic option files.  This is
 	because the Foomatic utility to load data kits
 	(foomatic-kitload) does not remove obsolete data files from
@@ -776,7 +1382,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
 	you generate will be incorrect and printing may work
 	incorrectly or not at all.
 
-	Foomatic option files are usually located in 
+	Foomatic option files are usually located in
 
 	/usr/local/share/foomatic/db/source/opt
 
@@ -815,7 +1421,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
 	site (http://gimp-print.sourceforge.net) for updated
 	instructions about this.
 
-     2) Unlike with the CUPS native driver, there is no simple way to
+     ii) Unlike with the CUPS native driver, there is no simple way to
 	update all PPD files when you install a new version of
 	Gutenprint.  You must either use the foomatic-ppdfile command
 	to upgrade PPD files individually, or foomatic-compiledb to
@@ -823,20 +1429,78 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
 	to install new PPD files, in which case you may use that
 	method.
 
-     3) The Foomatic data is version locked to the Gutenprint release
+     iii) The Foomatic data is version locked to the Gutenprint release
 	installed on the system.  For example, PPD files generated
 	with the Foomatic data for release 5.0.0 will not work with
 	the ijsgutenprint in release 5.0.1.  This is to prevent
 	accidentally using incorrect data, which could cause incorrect
 	function to take place.
 
-  8) The fix for bug 929227 (Gimp-Print incorrectly attempts to build
+  4) There is a known complication building "escputil" that causes
+     problems on some systems.  "escputil" uses the "readline"
+     package, to support command editing and history within the
+     program.  Unfortunately, linking programs with "readline" often
+     requires linking against additional libraries, and the exact
+     library depends upon the system (e. g. not all Linux systems have
+     the same requirements).
+
+     The configure script attempts to determine which additional
+     library must be linked against.  It tries using the following
+     libraries in this order to build a test executable:
+
+     -lncurses
+     -lcurses
+     -ltermcap
+     no additional libraries
+
+     The reason it tries other libraries first is that some systems
+     will link successfully, but only fail when an attempt is made to
+     actually call readline.  Therefore, we assume that additional
+     libraries are required.  Since we try the extra libraries in
+     order from most recent to oldest, we expect that the first one we
+     find will be appropriate.  For example, if the "ncurses" library
+     is the standard on a given system, the "termcap" library may be
+     provided for back compatibility, but it is unlikely that
+     "termcap" will be the standard with "curses" or "ncurses" being
+     provided for compatibility only (so that the link will succeed
+     but the command will use the incorrect library).
+
+     As this procedure is not failsafe, we provide the following
+     configure options to control this behavior:
+
+     ./configure --with-readline=yes  (the default; attempts to
+				      determine the correct library
+				      to link against)
+
+     ./configure --with-readline=no   (turns off use of readline
+				      altogether)
+
+     ./configure --with-readline=only (specifically instructs
+				      configure to not attempt to
+				      link against any other
+				      libraries)
+
+     ./configure --with-readline=libs (specifies the libraries to be
+				      linked against)
+
+     An hypothetical (this won't work anywhere!) example of the
+     latter would be
+
+     ./configure --with-readline='-lncurses -ltermcap'
+
+     Note that configure will not allow readline to be used if it
+     cannot successfully build the test program, regardless of the
+     option selected.  If you are having difficulty getting escputil
+     to build, we suggest using --with-readline=no.  The commands
+     used within escputil are very short and seldom require
+     significant editing.
+
+  5) The fix for bug 929227 (Gimp-Print incorrectly attempts to build
      against GIMP 2.0) requires special build instructions if you are
-     using a very old version of the GIMP 1.2 (versions affected are
-     believed to include 1.2.0, 1.2.1, and 1.2.2).  Specifically, you
-     must set GIMPTOOL in the environment to point to the proper
-     version of gimptool when running Gutenprint's configure script.
-     For example:
+     using a very old version of the GIMP 1.2 (1.2.0, 1.2.1, or
+     1.2.2).  Specifically, you must set GIMPTOOL in the environment
+     to point to the proper version of gimptool when running
+     Gutenprint's configure script.  For example:
 
      GIMPTOOL=/usr/bin/gimptool ./configure
 
@@ -876,1593 +1540,1940 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      installation of the GIMP.
 
 
-* Architectural Changes:
+================================================================
 
-  1) A modular architecture for family drivers.  A "family driver" is
-     a collection of printer drivers for one group of printers sharing
-     a common programming architecture, e. g. ESC/P2, PCL, Lexmark,
-     Canon.
+V) SUPPORTED PRINTERS:
 
-  2) A modular architecture for color processing.  This architecture
-     will enable us, or others, to provide color management without
-     having to change the internal interfaces within Gutenprint.
+A) LIST OF SUPPORTED PRINTERS
 
-  3) New composite data types.  Gutenprint 5.0 defines additional data
-     types.  These types include:
+The following is the complete list of printers believed to be
+compatible with Gutenprint, along with the name of the driver.  Some
+of these printers may work only partially; the specified drivers may
+not support the full range of resolutions, paper sizes, media sources,
+etc. that some of these printers may offer.
 
-     * Sequences, curves, and arrays.  A sequence is a primitive
-       vector of numbers data type; curves and arrays provide
-       additional capabilities such as interpolation (for curves) and
-       multiple dimensions (for arrays).
+Our practice is to provide preliminary support for printers as soon as
+we have information sufficient to code a functioning driver, and to
+release this support even in an otherwise stable release.  In this
+case, we note in the list below that support for a particular printer
+is "Experimental".  It is likely that printers that are supported in
+"Experimental" mode will produce poor quality at some or all
+resolutions and in addition may not function correctly at some
+resolutions.  Experimental Epson printers are most likely to produce
+good output at the highest resolution offered (2880x720, 2880x1440,
+2880x2880, or 5760x2880 DPI), since in general these printers will not
+use multiple drop sizes at such high resolutions.
 
-     * Lists are a general ordered container of named objects of
-       arbitrary type.  They are used throughout the core library in a
-       variety of ways.  The creator of a list can specify
-       constructor, destructor, name comparison, copy, and sort
-       operations on list members.
+Note that Gutenprint supports only the printer in multi-function
+devices -- this package does not support scanning, fax, copying, or
+any other function.  For scanning, please see the SANE project
+(http://www.sane-project.org).
 
-     * Parameters, which are part of the options system described
-       below.  In addition to storing values and descriptions of the
-       parameter, parameters can be queried to determine defaults and
-       constraints.  Parameter lists (which use the list container
-       internally) are also defined as part of this.
+Printer Name                   Driver Name                     Notes
+------- ----                   ------ ----                     -----
+Apollo P-2100                  pcl-apollo-p2100
+Apollo P-2150                  pcl-apollo-p2150
+Apollo P-2200                  pcl-apollo-p2200
+Apollo P-2250                  pcl-apollo-p2250
+Apollo P-2500                  pcl-apollo-p2500
+Apollo P-2550                  pcl-apollo-p2550
+Apollo P-2600                  pcl-apollo-p2600
+Apollo P-2650                  pcl-apollo-p2650
+Apple Color StyleWriter 4100   pcl-apple-4100
+Apple Color StyleWriter 4500   pcl-apple-4500
+Apple Color StyleWriter 6500   pcl-apple-6500
+Apple LaserWriter Select 360   pcl-apple-lw360
+Brother DCP-1200               brother-dcp-1200
+Brother HL-4Ve                 brother-hl-4ve
+Brother HL-10V                 brother-hl-10v
+Brother HL-10h                 brother-hl-10h
+Brother HL-630                 brother-hl-630
+Brother HL-660                 brother-hl-660
+Brother HL-760                 brother-hl-760
+Brother HL-960                 brother-hl-960
+Brother HL-1040                brother-hl-1040
+Brother HL-1050                brother-hl-1050
+Brother HL-1060                brother-hl-1060
+Brother HL-1070                brother-hl-1070
+Brother HL-1240                brother-hl-1240
+Brother HL-1250                brother-hl-1250
+Brother HL-1260                brother-hl-1260
+Brother HL-1270N               brother-hl-1270n
+Brother HL-1440                brother-hl-1440
+Brother HL-1660e               brother-hl-1660e
+Brother HL-2060                brother-hl-2060
+Brother MFC-6550MC             brother-mfc-6550mc
+Brother MFC-8300               brother-mfc-8300
+Brother MFC-9500               brother-mfc-9500
+Brother MFC-9600               brother-mfc-9600
+Canon BJ-30                    bjc-30
+Canon BJC-50                   bjc-50
+Canon BJC-55                   bjc-55
+Canon BJC-80                   bjc-80
+Canon BJC-85                   bjc-85
+Canon BJC-210                  bjc-210
+Canon BJC-240                  bjc-240
+Canon BJC-250                  bjc-250
+Canon BJC-1000                 bjc-1000
+Canon BJC-2000                 bjc-2000
+Canon BJC-2010                 bjc-2010
+Canon BJC-2100                 bjc-2100
+Canon BJC-2110                 bjc-2110
+Canon BJC-3000                 bjc-3000
+Canon BJC-4000                 bjc-4000
+Canon BJC-4300                 bjc-4300
+Canon BJC-4400                 bjc-4400
+Canon BJC-6000                 bjc-6000
+Canon BJC-6100                 bjc-6100
+Canon BJC-6200                 bjc-6200
+Canon BJC-6500                 bjc-6500
+Canon BJC-7000                 bjc-7000
+Canon BJC-7100                 bjc-7100
+Canon BJC-8200                 bjc-8200
+Canon CP-100                   canon-cp100
+Canon CP-200                   canon-cp200
+Canon CP-220                   canon-cp220
+Canon CP-300                   canon-cp300
+Canon CP-330                   canon-cp330
+Canon GP 335                   canon-gp_335
+Canon LBP-4sx                  canon-lbp-4sx
+Canon LBP-430                  canon-lbp-430
+Canon LBP-1000                 canon-lbp-1000
+Canon LBP-1260                 canon-lbp-1260
+Canon LBP-1760                 canon-lbp-1760
+Canon S100                     bjc-s100
+Canon S200                     bjc-s200                        Experimental
+Canon S300                     bjc-s300
+Canon S400                     bjc-s400
+Canon S450                     bjc-s450
+Canon S500                     bjc-s500
+Canon S600                     bjc-s600
+Canon S630                     bjc-s630
+Canon S800                     bjc-s800
+Canon S4500                    bjc-s4500
+Canon SELPHY-CP-400            canon-cp400
+Canon SELPHY-CP-500            canon-cp500
+Canon SELPHY-CP-510            canon-cp510
+Canon SELPHY-CP-600            canon-cp600
+Canon SELPHY-CP-710            canon-cp710
+Canon iP4000                   bjc-iP4000                      Experimental
+Canon imageRunner 330s         canon-ir_330s
+Citizen ProJet II              citizen-projet_ii
+DEC 1800                       dec-1800
+DEC LN17                       dec-ln17
+Epson ActionLaser 1100         epson-actl_1100
+Epson ActionLaser II           epson-actl_ii
+Epson AcuLaser C2000           epson-acl_c2000
+Epson AcuLaser C2000PS         epson-acl_c2000ps
+Epson AcuLaser C8500           epson-acl_c8500
+Epson AcuLaser C8500PS         epson-acl_c8500ps
+Epson AcuLaser C8600           epson-acl_c8600
+Epson AcuLaser C8600PS         epson-acl_c8600ps
+Epson EPL-5200                 epson-epl-5200
+Epson EPL-5200+                epson-epl-5200plus
+Epson EPL-5700                 epson-epl-5700
+Epson EPL-5700PS               epson-epl-5700ps
+Epson EPL-5800                 epson-epl-5800
+Epson EPL-5800PS               epson-epl-5800ps
+Epson EPL-5900                 epson-epl-5900
+Epson EPL-5900PS               epson-epl-5900ps
+Epson EPL-6100                 epson-epl-6100
+Epson EPL-6100PS               epson-epl-6100ps
+Epson EPL-7100                 epson-epl-7100
+Epson Stylus C20               escp2-c20
+Epson Stylus C20SX             escp2-c20sx
+Epson Stylus C20UX             escp2-c20ux
+Epson Stylus C40               escp2-c40
+Epson Stylus C40SX             escp2-c40sx
+Epson Stylus C40UX             escp2-c40ux
+Epson Stylus C41               escp2-c41
+Epson Stylus C41SX             escp2-c41sx
+Epson Stylus C41UX             escp2-c41ux
+Epson Stylus C42               escp2-c42
+Epson Stylus C42SX             escp2-c42sx
+Epson Stylus C42UX             escp2-c42ux
+Epson Stylus C43               escp2-c43
+Epson Stylus C43SX             escp2-c43sx
+Epson Stylus C43UX             escp2-c43ux
+Epson Stylus C44               escp2-c44
+Epson Stylus C44SX             escp2-c44sx
+Epson Stylus C44UX             escp2-c44ux
+Epson Stylus C45               escp2-c45
+Epson Stylus C46               escp2-c46
+Epson Stylus C48               escp2-c48
+Epson Stylus C50               escp2-c50
+Epson Stylus C60               escp2-c60
+Epson Stylus C61               escp2-c61
+Epson Stylus C62               escp2-c62
+Epson Stylus C63               escp2-c63
+Epson Stylus C64               escp2-c64
+Epson Stylus C65               escp2-c65
+Epson Stylus C66               escp2-c66
+Epson Stylus C68               escp2-c68
+Epson Stylus C70               escp2-c70
+Epson Stylus C80               escp2-c80
+Epson Stylus C82               escp2-c82
+Epson Stylus C83               escp2-c83
+Epson Stylus C84               escp2-c84
+Epson Stylus C85               escp2-c85
+Epson Stylus C86               escp2-c86
+Epson Stylus C88               escp2-c88
+Epson Stylus Color             escp2
+Epson Stylus Color I           escp2-i
+Epson Stylus Color II          escp2-ii
+Epson Stylus Color IIs         escp2-iis
+Epson Stylus Color PRO         escp2-pro
+Epson Stylus Pro XL            escp2-pro-xl
+Epson Stylus Color 400         escp2-400
+Epson Stylus Color 440         escp2-440
+Epson Stylus Color 460         escp2-460
+Epson Stylus Color 480         escp2-480
+Epson Stylus Color 500         escp2-500
+Epson Stylus Color 580         escp2-580
+Epson Stylus Color 600         escp2-600
+Epson Stylus Color 640         escp2-640
+Epson Stylus Color 660         escp2-660
+Epson Stylus Color 670         escp2-670
+Epson Stylus Color 680         escp2-680
+Epson Stylus Color 740         escp2-740
+Epson Stylus Color 760         escp2-760
+Epson Stylus Color 777         escp2-777
+Epson Stylus Color 800         escp2-800
+Epson Stylus Color 850         escp2-850
+Epson Stylus Color 860         escp2-860
+Epson Stylus Color 880         escp2-880
+Epson Stylus Color 8 3         escp2-83
+Epson Stylus Color 900         escp2-900
+Epson Stylus Color 980         escp2-980
+Epson Stylus Color 1160        escp2-1160
+Epson Stylus Color 1500        escp2-1500
+Epson Stylus Color 1520        escp2-1520
+Epson Stylus Color 3000        escp2-3000
+Epson Stylus Photo             escp2-photo
+Epson Stylus Photo 700         escp2-700
+Epson Stylus Photo EX          escp2-ex
+Epson Stylus Photo EX3         escp2-ex3
+Epson Stylus Photo 720         escp2-720
+Epson Stylus Photo 750         escp2-750
+Epson Stylus Photo 780         escp2-780
+Epson Stylus Photo 785         escp2-785
+Epson Stylus Photo 790         escp2-790
+Epson Stylus Photo 810         escp2-810
+Epson Stylus Photo 820         escp2-820
+Epson Stylus Photo 825         escp2-825
+Epson Stylus Photo 830         escp2-830
+Epson Stylus Photo 830U        escp2-830u
+Epson Stylus Photo 870         escp2-870
+Epson Stylus Photo 875         escp2-875
+Epson Stylus Photo 890         escp2-890
+Epson Stylus Photo 895         escp2-895
+Epson Stylus Photo 900         escp2-ph900
+Epson Stylus Photo 915         escp2-915
+Epson Stylus Photo 925         escp2-925
+Epson Stylus Photo 935         escp2-935
+Epson Stylus Photo 950         escp2-950
+Epson Stylus Photo 960         escp2-960
+Epson Stylus Photo 1200        escp2-1200
+Epson Stylus Photo 1270        escp2-1270
+Epson Stylus Photo 1280        escp2-1280
+Epson Stylus Photo 1290        escp2-1290
+Epson Stylus Photo 2000P       escp2-2000
+Epson Stylus Photo 2100        escp2-2100
+Epson Stylus Photo 2200        escp2-2200
+Epson Stylus Photo R200        escp2-r200
+Epson Stylus Photo R210        escp2-r210
+Epson Stylus Photo R220        escp2-r220
+Epson Stylus Photo R300        escp2-r300
+Epson Stylus Photo R310        escp2-r310
+Epson Stylus Photo R320        escp2-r320
+Epson Stylus Photo R340        escp2-r340
+Epson Stylus Photo RX400       escp2-rx400
+Epson Stylus Photo RX420       escp2-rx420
+Epson Stylus Photo RX425       escp2-rx425
+Epson Stylus Photo RX430       escp2-rx430
+Epson Stylus Photo RX500       escp2-rx500
+Epson Stylus Photo RX510       escp2-rx510
+Epson Stylus Photo RX600       escp2-rx600
+Epson Stylus Photo RX620       escp2-rx620
+Epson Stylus Photo RX630       escp2-rx630
+Epson Stylus Photo RX700       escp2-rx700
+Epson Stylus Photo R800        escp2-r800
+Epson Stylus Photo R1800       escp2-r1800
+Epson Stylus Photo R2400       escp2-r2400
+Epson Stylus Pro 5000          escp2-5000
+Epson Stylus Pro 5500          escp2-5500
+Epson Stylus Pro 7000          escp2-7000
+Epson Stylus Pro 7500          escp2-7500
+Epson Stylus Pro 7600          escp2-7600
+Epson Stylus Pro 9000          escp2-9000
+Epson Stylus Pro 9500          escp2-9500
+Epson Stylus Pro 9600          escp2-9600
+Epson Stylus Pro 10000         escp2-10000
+Epson Stylus Scan 2000         escp2-scan2000
+Epson Stylus Scan 2500         escp2-scan2500
+Epson Stylus CX1500            escp2-cx1500
+Epson Stylus CX3100            escp2-cx3100
+Epson Stylus CX3200            escp2-cx3200
+Epson Stylus CX3500            escp2-cx3500
+Epson Stylus CX3600            escp2-cx3600
+Epson Stylus CX3650            escp2-cx3650
+Epson Stylus CX3700            escp2-cx3700
+Epson Stylus CX3800            escp2-cx3800
+Epson Stylus CX3805            escp2-cx3805
+Epson Stylus CX3810            escp2-cx3810
+Epson Stylus CX4100            escp2-cx4100
+Epson Stylus CX4200            escp2-cx4200
+Epson Stylus CX4500            escp2-cx4500
+Epson Stylus CX4600            escp2-cx4600
+Epson Stylus CX4700            escp2-cx4700
+Epson Stylus CX4800            escp2-cx4800
+Epson Stylus CX5100            escp2-cx5100
+Epson Stylus CX5200            escp2-cx5200
+Epson Stylus CX5300            escp2-cx5300
+Epson Stylus CX5400            escp2-cx5400
+Epson Stylus CX5700            escp2-cx5700
+Epson Stylus CX5800            escp2-cx5800
+Epson Stylus CX6300            escp2-cx6300
+Epson Stylus CX6400            escp2-cx6400
+Epson Stylus CX6500            escp2-cx6500
+Epson Stylus CX6600            escp2-cx6600
+Epson Stylus CX7700            escp2-cx7700
+Epson Stylus CX7800            escp2-cx7800
+Epson Stylus CX8300            escp2-cx8300
+Epson Stylus CX8400            escp2-cx8400
+Epson Stylus D68               escp2-d68
+Epson Stylus D88               escp2-d88
+Epson Stylus DX3800            escp2-dx3800
+Epson Stylus DX3850            escp2-dx3850
+Epson Stylus DX4200            escp2-dx4200
+Epson Stylus DX4250            escp2-dx4250
+Epson Stylus DX4800            escp2-dx4800
+Epson PictureMate              escp2-picmate
+Epson PictureMate Deluxe       escp2-picmated
+Epson CL 700                   escp2-cl700
+Epson CL 750                   escp2-cl750
+Epson CL 760                   escp2-cl760                     Experimental
+Epson E 100                    escp2-e100
+Epson E 150                    escp2-e150
+Epson E 200                    escp2-e200
+Epson EM 900C                  escp2-em900c
+Epson EM 930C                  escp2-em930c
+Epson MC 2000                  escp2-mc2000
+Epson MC 5000                  escp2-mc5000
+Epson MC 7000                  escp2-mc7000
+Epson MC 9000                  escp2-mc9000
+Epson MC 10000                 escp2-mc10000
+Epson MJ 930C                  escp2-mj930c
+Epson MJ 5100C                 escp2-mj5100c
+Epson MJ 6000C                 escp2-mj6000c
+Epson MJ 8000C                 escp2-mj8000c
+Epson PM 700C                  escp2-pm700c
+Epson PM 730C                  escp2-pm730c
+Epson PM 740C                  escp2-pm740c                    Experimental
+Epson PM 750C                  escp2-pm750c
+Epson PM 760C                  escp2-pm760c
+Epson PM 770C                  escp2-pm770c
+Epson PM 780C                  escp2-pm780c
+Epson PM 790PT                 escp2-pm790pt
+Epson PM 800C                  escp2-pm800c
+Epson PM 850PT                 escp2-pm850pt
+Epson PM 870C                  escp2-pm870c                    Experimental
+Epson PM 880C                  escp2-pm880c
+Epson PM 930C                  escp2-pm930c                    Experimental
+Epson PM 940C                  escp2-pm940c                    Experimental
+Epson PM 950C                  escp2-pm950c
+Epson PM 970C                  escp2-pm970c                    Experimental
+Epson PM 980C                  escp2-pm980c                    Experimental
+Epson PM 2000C                 escp2-pm2000c
+Epson PM 2200C                 escp2-pm2200c
+Epson PM 3000C                 escp2-pm3000c
+Epson PM 3300C                 escp2-pm3300c
+Epson PM 3500C                 escp2-pm3500c
+Epson PM 3700C                 escp2-pm3700c                   Experimental
+Epson PM 4000PX                escp2-pm4000px
+Epson PM 5000C                 escp2-pm5000c
+Epson PM 7000C                 escp2-pm7000c
+Epson PM 9000C                 escp2-pm9000c
+Epson PM 10000                 escp2-pm10000
+Epson PM A650                  escp2-pma650                    Experimental
+Epson PM A750                  escp2-pma750                    Experimental
+Epson PM A890                  escp2-pma890                    Experimental
+Epson PM A900                  escp2-pma900
+Epson PM A950                  escp2-pma950
+Epson PM D600                  escp2-pmd600                    Experimental
+Epson PM D750                  escp2-pmd750
+Epson PM D770                  escp2-pmd770
+Epson PM D800                  escp2-pmd800                    Experimental
+Epson PM D1000                 escp2-pmd1000
+Epson PM G700                  escp2-pmg700
+Epson PM G720                  escp2-pmg720
+Epson PM G730                  escp2-pmg730
+Epson PM G800                  escp2-pmg800                    Experimental
+Epson PM G820                  escp2-pmg820                    Experimental
+Epson PX A650                  escp2-pxa650
+Epson PX G900                  escp2-pxg900
+Epson PX G920                  escp2-pxg920
+Epson PX G5000                 escp2-pxg5000
+Epson PX V500                  escp2-pxv500
+Epson PX V600                  escp2-pxv600
+Epson PX V630                  escp2-pxv630
+Epson PX 5500                  escp2-px5500
+Epson PX 7000                  escp2-px7000
+Epson PX 9000                  escp2-px9000
+Fujifilm Printpix-CX-400       fujifilm-cx400
+Fujifilm Printpix-CX-550       fujifilm-cx550
+Fujitsu PrintPartner 10V       fujitsu-pp_10v
+Fujitsu PrintPartner 16DV      fujitsu-pp_16dv
+Fujitsu PrintPartner 20W       fujitsu-pp_20w
+Fujitsu PrintPartner 8000      fujitsu-pp_8000
+Generic PCL 4 Printer          pcl-g_4
+Generic PCL 5 Printer          pcl-g_5
+Generic PCL 5c Printer         pcl-g_5c
+Generic PCL 5e Printer         pcl-g_5e
+Generic PCL 6/PCL XL Printer   pcl-g_6
+HP Business Inkjet 2200        hp-bij_2200
+HP Business Inkjet 2230        hp-bij_2230
+HP Business Inkjet 2250        hp-bij_2250
+HP Business Inkjet 2250TN      hp-bij_2250tn
+HP Business Inkjet 2280        hp-bij_2280
+HP Color Inkjet Printer CP1160 hp-cij_cp1160
+HP Color Inkjet Printer CP1700 hp-cij_cp1700
+HP Color LaserJet 2500         hp-clj_2500
+HP Color LaserJet 4500         hp-clj_4500
+HP Color LaserJet 4550         hp-clj_4550
+HP Color LaserJet 4600         hp-clj_4600
+HP Color LaserJet 5            hp-clj_5
+HP Color LaserJet 5000         hp-clj_5000
+HP Color LaserJet 5500         hp-clj_5500
+HP Color LaserJet 8550GN       hp-clj_8550gn
+HP DesignJet 230               pcl-desnj-230
+HP DesignJet 250C              pcl-desnj-250
+HP DesignJet 430               pcl-desnj-430
+HP DesignJet 450C              pcl-desnj-450
+HP DesignJet 455CA             pcl-desnj-455
+HP DesignJet 488CA             pcl-desnj-488
+HP DesignJet 700               pcl-desnj-700
+HP DesignJet 750C Plus         hp-desnj_750c_plus
+HP DesignJet 750C              pcl-750
+HP DesignJet 2500CP            pcl-desnj-2500
+HP DesignJet 3500CP            pcl-desnj-3500
+HP DesignJet ColorPro CAD      hp-desnj_cp_cad
+HP DeskJet 400                 pcl-400
+HP DeskJet 420C                hp-dj_420c
+HP DeskJet 450                 hp-dj_450
+HP DeskJet 500                 pcl-500
+HP DeskJet 500C                pcl-501
+HP DeskJet 505J Plus           hp-dj_505j_plus
+HP DeskJet 510                 hp-dj_510
+HP DeskJet 520                 pcl-520
+HP DeskJet 540C                pcl-540
+HP DeskJet 550C                pcl-550
+HP DeskJet 5550                hp-dj_5550
+HP DeskJet 5551                hp-dj_5551
+HP DeskJet 560C                pcl-560
+HP DeskJet 600                 pcl-600
+HP DeskJet 600C                pcl-601
+HP DeskJet 610C                hp-dj_610c
+HP DeskJet 610CL               hp-dj_610cl
+HP DeskJet 6122                hp-dj_6122
+HP DeskJet 6127                hp-dj_6127
+HP DeskJet 612C                hp-dj_612c
+HP DeskJet 640C                hp-dj_640c
+HP DeskJet 648C                hp-dj_648c
+HP DeskJet 660C                hp-dj_660c
+HP DeskJet 670C                hp-dj_670c
+HP DeskJet 670TV               hp-dj_670tv
+HP DeskJet 672C                hp-dj_672c
+HP DeskJet 680C                hp-dj_680c
+HP DeskJet 682C                hp-dj_682c
+HP DeskJet 690C                pcl-690
+HP DeskJet 692C                hp-dj_692c
+HP DeskJet 693C                hp-dj_693c
+HP DeskJet 694C                hp-dj_694c
+HP DeskJet 695C                hp-dj_695c
+HP DeskJet 697C                hp-dj_697c
+HP DeskJet 810C                pcl-810
+HP DeskJet 812C                pcl-812
+HP DeskJet 815C                hp-dj_815c
+HP DeskJet 816C                hp-dj_816c
+HP DeskJet 825C                hp-dj_825c
+HP DeskJet 830C                hp-dj_830c
+HP DeskJet 832C                hp-dj_832c
+HP DeskJet 840C                pcl-840
+HP DeskJet 841C                hp-dj_841c
+HP DeskJet 842C                pcl-842
+HP DeskJet 843C                hp-dj_843c
+HP DeskJet 845C                pcl-845
+HP DeskJet 850C                pcl-850
+HP DeskJet 855C                pcl-855
+HP DeskJet 870C                pcl-870
+HP DeskJet 880C                hp-dj_880c
+HP DeskJet 882C                hp-dj_882c
+HP DeskJet 890C                pcl-890
+HP DeskJet 895C                pcl-895
+HP DeskJet 916C                pcl-900
+HP DeskJet 920C                hp-dj_920c
+HP DeskJet 9300                hp-dj_9300
+HP DeskJet 930C                hp-dj_930c
+HP DeskJet 932C                hp-dj_932c
+HP DeskJet 933C                hp-dj_933c
+HP DeskJet 934C                hp-dj_934c
+HP DeskJet 935C                hp-dj_935c
+HP DeskJet 940C                hp-dj_940c
+HP DeskJet 948C                hp-dj_948c
+HP DeskJet 950C                hp-dj_950c
+HP DeskJet 952C                hp-dj_952c
+HP DeskJet 955C                hp-dj_955c
+HP DeskJet 957C                hp-dj_957c
+HP DeskJet 959C                hp-dj_959c
+HP DeskJet 960C                hp-dj_960c
+HP DeskJet 970C                hp-dj_970c
+HP DeskJet 975C                hp-dj_975c
+HP DeskJet 980C                hp-dj_980c
+HP DeskJet 990C                hp-dj_990c
+HP DeskJet 995C                hp-dj_995c
+HP DeskJet 1100C               pcl-1100
+HP DeskJet 1120C               pcl-1120
+HP DeskJet 1125C               hp-dj_1125c
+HP DeskJet 1200C               pcl-1200
+HP DeskJet 1220C               pcl-1220
+HP DeskJet 1600C               pcl-1600
+HP DeskJet 1600CM              hp-dj_1600cm
+HP DeskJet 2000                pcl-2000
+HP DeskJet 2500                pcl-2500
+HP DeskJet 2500CM              hp-2500cm
+HP DeskJet 340C                pcl-340
+HP DeskJet 3810                hp-dj_3810
+HP DeskJet 3816                hp-dj_3816
+HP DeskJet 3820                hp-dj_3820
+HP DeskJet 3822                hp-dj_3822
+HP LaserJet 2                  pcl-2
+HP LaserJet 2D                 hp-lj_2d
+HP LaserJet 2P Plus            hp-lj_2p_plus
+HP LaserJet 2P                 pcl-2p
+HP LaserJet 3                  pcl-3
+HP LaserJet 3D                 hp-lj_3d
+HP LaserJet 3P w/ PCL5         hp-lj_3p_w_pcl5
+HP LaserJet 3P w/PS            hp-lj_3p_w_ps
+HP LaserJet 4 Plus             hp-lj_4_plus
+HP LaserJet 4                  pcl-4
+HP LaserJet 4L                 pcl-4l
+HP LaserJet 4M                 hp-lj_4m
+HP LaserJet 4ML                hp-lj_4ml
+HP LaserJet 4P                 hp-lj_4p
+HP LaserJet 4Si                pcl-4si
+HP LaserJet 4V                 pcl-4v
+HP LaserJet 5                  pcl-5
+HP LaserJet 5L                 hp-lj_5l
+HP LaserJet 5M                 hp-lj_5m
+HP LaserJet 5MP                hp-lj_5mp
+HP LaserJet 5P                 hp-lj_5p
+HP LaserJet 5Si                pcl-5si
+HP LaserJet 6                  pcl-6
+HP LaserJet 6L                 hp-lj_6l
+HP LaserJet 6MP                hp-lj_6mp
+HP LaserJet 6P                 hp-lj_6p
+HP LaserJet 1010               hp-lj_1010
+HP LaserJet 1012               hp-lj_1012
+HP LaserJet 1015               hp-lj_1015
+HP LaserJet 1100               hp-lj_1100
+HP LaserJet 1100A              hp-lj_1100a
+HP LaserJet 1150               hp-lj_1150
+HP LaserJet 1200               hp-lj_1200
+HP LaserJet 1220               hp-lj_1220
+HP LaserJet 1300               hp-lj_1300
+HP LaserJet 2100               hp-lj_2100
+HP LaserJet 2100M              hp-lj_2100m
+HP LaserJet 2200               hp-lj_2200
+HP LaserJet 2300               hp-lj_2300
+HP LaserJet 3200               hp-lj_3200
+HP LaserJet 3200m              hp-lj_3200m
+HP LaserJet 3200se             hp-lj_3200se
+HP LaserJet 3300 MFP           hp-lj_3300_mfp
+HP LaserJet 3310 MFP           hp-lj_3310_mfp
+HP LaserJet 3320 MFP           hp-lj_3320_mfp
+HP LaserJet 3320N MFP          hp-lj_3320n_mfp
+HP LaserJet 3330 MFP           hp-lj_3330_mfp
+HP LaserJet 4000               hp-lj_4000
+HP LaserJet 4050               hp-lj_4050
+HP LaserJet 4100               hp-lj_4100
+HP LaserJet 4200               hp-lj_4200
+HP LaserJet 4300               hp-lj_4300
+HP LaserJet 5000               hp-lj_5000
+HP LaserJet 5100               hp-lj_5100
+HP LaserJet 8000               hp-lj_8000
+HP LaserJet 8100               hp-lj_8100
+HP LaserJet 8150               hp-lj_8150
+HP LaserJet 9000               hp-lj_9000
+HP Mopier 240                  hp-mopier_240
+HP Mopier 320                  hp-mopier_320
+HP OfficeJet 300               hp-oj_300
+HP OfficeJet 330               hp-oj_330
+HP OfficeJet 350               hp-oj_350
+HP OfficeJet 500               hp-oj_500
+HP OfficeJet 520               hp-oj_520
+HP OfficeJet 570               hp-oj_570
+HP OfficeJet 580               hp-oj_580
+HP OfficeJet 590               hp-oj_590
+HP OfficeJet 600               hp-oj_600
+HP OfficeJet 610               hp-oj_610
+HP OfficeJet 625               hp-oj_625
+HP OfficeJet 630               hp-oj_630
+HP OfficeJet 635               hp-oj_635
+HP OfficeJet 700               hp-oj_700
+HP OfficeJet 710               hp-oj_710
+HP OfficeJet 720               hp-oj_720
+HP OfficeJet 725               hp-oj_725
+HP OfficeJet 5105              hp-oj_5105
+HP OfficeJet 5110              hp-oj_5110
+HP OfficeJet 5110xi            hp-oj_5110xi
+HP OfficeJet 6105              hp-oj_6105
+HP OfficeJet 6110              hp-oj_6110
+HP OfficeJet 7110              hp-oj_7110
+HP OfficeJet 7130              hp-oj_7130
+HP OfficeJet 7140              hp-oj_7140
+HP OfficeJet D125              hp-oj_d125
+HP OfficeJet D135              hp-oj_d135
+HP OfficeJet D145              hp-oj_d145
+HP OfficeJet D155              hp-oj_d155
+HP OfficeJet G55               hp-oj_g55
+HP OfficeJet G85               hp-oj_g85
+HP OfficeJet G95               hp-oj_g95
+HP OfficeJet K60               hp-oj_k60
+HP OfficeJet K60xi             hp-oj_k60xi
+HP OfficeJet K80               hp-oj_k80
+HP OfficeJet K80xi             hp-oj_k80xi
+HP OfficeJet LX                hp-oj_lx
+HP OfficeJet Pro 1150C         hp-oj_pro_1150c
+HP OfficeJet Pro 1170C         hp-oj_pro_1170c
+HP OfficeJet Pro 1175C         hp-oj_pro_1175c
+HP OfficeJet R40               hp-oj_r40
+HP OfficeJet R45               hp-oj_r45
+HP OfficeJet R60               hp-oj_r60
+HP OfficeJet R65               hp-oj_r65
+HP OfficeJet R80               hp-oj_r80
+HP OfficeJet T45               hp-oj_t45
+HP OfficeJet T65               hp-oj_t65
+HP OfficeJet V40               hp-oj_v40
+HP OfficeJet V40xi             hp-oj_v40xi
+HP OfficeJet                   hp-oj
+HP PSC 370                     hp-psc_370
+HP PSC 380                     hp-psc_380
+HP PSC 500                     hp-psc_500
+HP PSC 750                     hp-psc_750
+HP PSC 950                     hp-psc_950
+HP PSC 950xi                   hp-psc_950xi
+HP PSC 2110                    hp-psc_2110
+HP PSC 2150                    hp-psc_2150
+HP PSC 2210                    hp-psc_2210
+HP PhotoSmart 7150             hp-psc_7150
+HP PhotoSmart 7345             hp-psc_7345
+HP PhotoSmart 7350             hp-psc_7350
+HP PhotoSmart 7550             hp-psc_7550
+HP PhotoSmart P100             hp-psc_p100
+HP PhotoSmart P130             hp-psc_p130
+HP PhotoSmart P230             hp-psc_p230
+HP PhotoSmart P1000            pcl-P1000
+HP PhotoSmart P1100            pcl-P1100
+HP PhotoSmart P1115            hp-psc_p1115
+HP PhotoSmart P1215            hp-psc_p1215
+HP PhotoSmart P1218            hp-psc_p1218
+HP PhotoSmart P1315            hp-psc_p1315
+HP e-printer e20               hp-e-printer_e20
+IBM 4019                       ibm-4019
+IBM 4029 030 LaserPrinter 10   ibm-4029_030_lp_10
+IBM 4312                       ibm-4312
+IBM Infoprint 12               ibm-infoprint_12
+IBM Page Printer 3112          ibm-pp_3112
+Infotec 4651 MF                infotec-4651_mf
+Kyocera F-1010                 kyocera-f-1010
+Kyocera FS-600 (KPDL-2)        kyocera-fs-600_kpdl-2
+Kyocera FS-600                 kyocera-fs-600
+Kyocera FS-680                 kyocera-fs-680
+Kyocera FS-800                 kyocera-fs-800
+Kyocera FS-1000                kyocera-fs-1000
+Kyocera FS-1000+               kyocera-fs-1000plus
+Kyocera FS-1010                kyocera-fs-1010
+Kyocera FS-1050                kyocera-fs-1050
+Kyocera FS-1200                kyocera-fs-1200
+Kyocera FS-1600                kyocera-fs-1600
+Kyocera FS-1600+               kyocera-fs-1600plus
+Kyocera FS-1700                kyocera-fs-1700
+Kyocera FS-1700+               kyocera-fs-1700plus
+Kyocera FS-1750                kyocera-fs-1750
+Kyocera FS-1800                kyocera-fs-1800
+Kyocera FS-1800+               kyocera-fs-1800plus
+Kyocera FS-1900                kyocera-fs-1900
+Kyocera FS-3500                kyocera-fs-3500
+Kyocera FS-3600                kyocera-fs-3600
+Kyocera FS-3600+               kyocera-fs-3600plus
+Kyocera FS-3700                kyocera-fs-3700
+Kyocera FS-3700+               kyocera-fs-3700plus
+Kyocera FS-3750                kyocera-fs-3750
+Kyocera FS-3800                kyocera-fs-3800
+Kyocera FS-5800C               kyocera-fs-5800c
+Kyocera FS-5900C               kyocera-fs-5900c
+Kyocera FS-6500                kyocera-fs-6500
+Kyocera FS-6500+               kyocera-fs-6500plus
+Kyocera FS-6700                kyocera-fs-6700
+Kyocera FS-7000                kyocera-fs-7000
+Kyocera FS-7000+               kyocera-fs-7000plus
+Kyocera FS-8000C               kyocera-fs-8000c
+Kyocera FS-9000                kyocera-fs-9000
+Kyocera FS-9100DN              kyocera-fs-9100dn
+Kyocera FS-9500DN              kyocera-fs-9500dn
+Kyocera KM-1530                kyocera-km-1530
+Kyocera KM-1810                kyocera-km-1810
+Kyocera KM-2030                kyocera-km-2030
+Kyocera KM-2530                kyocera-km-2530
+Kyocera KM-3530                kyocera-km-3530
+Kyocera KM-4230                kyocera-km-4230
+Kyocera KM-4530                kyocera-km-4530
+Kyocera KM-5230                kyocera-km-5230
+Kyocera KM-5530                kyocera-km-5530
+Kyocera KM-6230                kyocera-km-6230
+Lexmark 4076                   lexmark-4076
+Lexmark Optra E                lexmark-optra_e
+Lexmark Optra E+               lexmark-optra_eplus
+Lexmark Valuewriter 300        lexmark-vw_300
+Lexmark Z42                    lexmark-z42
+Lexmark Z43                    lexmark-z43
+Lexmark Z52                    lexmark-z52
+Lexmark Z53                    lexmark-z53
+Minolta PagePro 1100           minolta-pp_1100
+Minolta PagePro 6              minolta-pp_6
+Minolta PagePro 6e             minolta-pp_6e
+Minolta PagePro 6ex            minolta-pp_6ex
+Minolta PagePro 8              minolta-pp_8
+Minolta PagePro 8L             minolta-pp_8l
+NEC SuperScript 1260           nec-ssc_1260
+NEC SuperScript 1400           nec-ssc_1400
+NEC SuperScript 1800           nec-ssc_1800
+NEC SuperScript 660i           nec-ssc_660i
+NEC SuperScript 860            nec-ssc_860
+NEC SuperScript 870            nec-ssc_870
+Okidata OL400                  okidata-ol400
+Okidata OL400e                 okidata-ol400e
+Okidata OL400ex                okidata-ol400ex
+Okidata OL410e                 okidata-ol410e
+Okidata OL600e                 okidata-ol600e
+Okidata OL610e/S               okidata-ol610e_s
+Okidata OL800                  okidata-ol800
+Okidata OL810ex                okidata-ol810ex
+Okidata Okipage 6e             okidata-okp_6e
+Okidata Okipage 6ex            okidata-okp_6ex
+Okidata Okipage 8p             okidata-okp_8p
+Okidata Okipage 10e            okidata-okp_10e
+Okidata Okipage 10ex           okidata-okp_10ex
+Okidata Okipage 14ex           okidata-okp_14ex
+Okidata Super 6e               okidata-super_6e
+Olivetti JP350S                olivetti-jp350s
+Olivetti PG 306                olivetti-pg_306
+Olympus P-10                   olympus-p10
+Olympus P-11                   olympus-p11
+Olympus P-200                  olympus-p200
+Olympus P-300                  olympus-p300
+Olympus P-300E                 olympus-p300e
+Olympus P-300U                 olympus-p300u
+Olympus P-330E                 olympus-p330e
+Olympus P-330NE                olympus-p330ne
+Olympus P-400                  olympus-p400
+Olympus P-440                  olympus-p440
+PCPI 1030                      pcpi-1030
+Panasonic KX-P4410             panasonic-kx-p4410
+Panasonic KX-P4450             panasonic-kx-p4450
+Panasonic KX-P6150             panasonic-kx-p6150
+Panasonic KX-P6500             panasonic-kx-p6500
+Raven LP-410                   raven-lp-410
+Ricoh Aficio 220               ricoh-afc_220
+Ricoh Aficio 401               ricoh-afc_401
+Ricoh Aficio 700               ricoh-afc_700
+Samsung ML-85                  samsung-ml-85
+Samsung ML-4600                samsung-ml-4600
+Samsung ML-5000a               samsung-ml-5000a
+Samsung ML-6000                samsung-ml-6000
+Samsung ML-6100                samsung-ml-6100
+Samsung ML-7000                samsung-ml-7000
+Samsung ML-7000N               samsung-ml-7000n
+Samsung ML-7000P               samsung-ml-7000p
+Samsung ML-7050                samsung-ml-7050
+Samsung QL-5100A               samsung-ql-5100a
+Samsung QL-6050                samsung-ql-6050
+Seiko SpeedJET 200             seiko-sj_200
+Sharp AR-161                   sharp-ar-161
+Sony IJP-V100                  sony-ijp-v100
+Sony UP-DP10                   sony-updp10                     Experimental
+Sony UP-DR150                  sony-updr150                    Experimental
+Star LS-04                     star-ls-04
+Star LaserPrinter 8            star-lp_8
+Tally MT908                    tally-mt908
+Xerox Able 1406                xerox-able_1406
+Xerox DocuPrint 4508           xerox-dp_4508
+Xerox DocuPrint C20            xerox-dp_c20
+Xerox DocuPrint N4512          xerox-dp_n4512
+Xerox DocuPrint N4512PS        xerox-dp_n4512ps
+Xerox DocuPrint P12            xerox-dp_p12
+Xerox DocuPrint P1202          xerox-dp_p1202
+Xerox DocuPrint P8e            xerox-dp_p8e
+Xerox Document Centre 400      xerox-dc_400
+
+
+----------------
+
+B) PRINTER-SPECIFIC NOTES:
+
+  1) It is strongly recommended that four color mode not be used on
+     the Epson Stylus C63, C64, C65, C66, C70, C80, and CX-5200, and
+     the PX-V500 and PX-V600 when printing to glossy papers, as the
+     black ink is formulated differently from the color ink and does
+     not adhere properly to these papers.  Epson Photo Paper, Premium
+     Glossy Photo Paper, Premium Luster Photo Paper, and Premium
+     Semigloss Photo Paper are known to be affected.  If you use the
+     default settings (specifically, the Standard ink type), this will
+     be handled automatically.
+
+  2) The Gutenprint driver does not in all cases offer the same set of
+     resolutions offered by the printer manufacturer's drivers.  There
+     are a variety of reasons why that is the case:
+
+     i) In some cases, we have not determined the necessary commands
+	to utilize some resolutions (particularly very high
+	resolutions).
+
+     ii) In some cases, the advertised printer resolution may not
+	match what we determine to be the maximum resolution based on
+	our understanding of the printer's capabilities.  Sometimes
+	the advertised resolution is qualified by a statement that
+	implies that the actual resolution may be different from the
+	stated resolution.  In some cases, we may be able to achieve
+	the same number of drops per square inch by means of a
+	different resolution.  For example, we may determine that a
+	printer that is advertised to support 5760x720 DPI in fact
+	supports 2880x1440 DPI.  This is the same number of droplets
+	per square inch (4147200), but with a different aspect ratio
+	(the ratio of the horizontal resolution to the vertical
+	resolution).
+
+     iii) In some cases, we offer additional resolutions not offered by
+	the printer vendor.  These resolutions may be either lower or
+	higher than those offered by the printer vendor.
+
+	We frequently offer lower resolutions than those offered by
+	the printer vendor to offer a greater choice of printing
+	speed.  These resolutions will offer low quality but very
+	fast printing speed for use where the quality is unimportant
+	but speed is of the greatest importance.
+
+	In some cases, we offer resolutions higher (or simply
+	different) than those advertised by printer vendors.  We will
+	offer these options if testing determines that these
+	resolutions can be used safely and we determine that these
+	resolutions offer a potential benefit in quality in some
+	cases.
+
+	It is almost always better to have a printing resolution with
+	a smaller aspect ratio (i. e. the horizontal and vertical
+	resolutions are similar).  For example, a resolution of
+	2880x1440 DPI is likely to yield superior results to a
+	resolution of 5760x720 DPI.  Therefore, in some cases we do
+	not offer certain resolutions offered by the printer vendor
+	(in the case of the Epson Stylus Photo R800, 5760x1440 DPI)
+	because they are not likely to yield any benefit (either speed
+	or quality) over another resolution that we offer (in this
+	case, 2880x1440 DPI Highest Quality).
+
+	Indeed, we have received reports that in some cases a lower
+	resolution may actually offer improved quality over a higher
+	resolution.  For example, the Epson Stylus Photo 780 is
+	reported to yield better quality at 1440x720 DPI Highest
+	Quality than 2880x720 DPI.
+
+     We periodically evaluate the list of resolutions we offer to
+     decide whether to offer any additional options.
+
+  3) Many Epson printers (specifically, the Epson Stylus Color 740 and
+     all newer printers) will not respond to ASCII text without a
+     special "activation" sequence (specifically, this command takes
+     the printers out of "packet mode").  A brand new printer, or one
+     that has been connected to a Windows system, may or may not work
+     in packet mode.  Therefore, the common suggestion to test a
+     printer port by sending plain text to it may not work for these
+     printers; failure to print in this fashion is not a positive
+     indication that the printer or the connection is malfunctioning.
+     These printers are, however, able to print plain text *after* the
+     activation sequence is sent.
+
+     A suggestion would be to first verify that the printer is capable
+     of returning ink levels.  This may be done via
+
+     escputil -i -r /dev/lp0
+
+     (or whatever device your printer is connected to in place of
+     /dev/lp0).  If this returns status, it demonstrates that the link
+     between your computer and printer is working.
 
-     * String lists are used in various ways; in particular, they are
-       used by the parameter system to inform programs of the
-       available choices of values for string-valued parameters.
 
-  4) Complete overhaul of the options system.  Rather than offering a
-     fixed set of operations, family drivers, color modules, etc. can
-     now offer a wide variety of options using a predefined set of
-     data types.  The data types currently supported are strings
-     picked from a list, floating point numbers, integers, curves,
-     arrays, Boolean values, dimensions, and filenames.
+================================================================
 
-     The new options system provides a flexible way for drivers to
-     inform applications of default values and UI hints, the ability
-     to selectively enable and disable options, and a generalized way
-     of verifying legality of option choices.
+VI) LIST OF SUPPORTED OPTIONS
 
-  5) The coordinate system has been changed from bottom left to top
-     left of the page, and the printable area can now extend beyond
-     the edge of the page.  The result is a more intuitive coordinate
-     system for driver writers that matches the coordinate system of
-     printers, and the ability to do true full bleed.
+This section details the options available in this release of
+Gutenprint 5.0.  More advanced options are subject to change between
+releases, and existing options may acquire additional choices as new
+capabilities are added.
 
-  6) The specification of color correction, input, and output modes
-     has been completely revised, permitting applications to specify
-     input mode, output mode, channel bit depth, and color correction
-     completely independently.  This architecture is also more
-     extensible.
+These options are not supported by all printers; depending upon the
+functionality of the driver and printer, different capabilities are
+available for different printers.
 
-  7) Complete overhaul of the black generation in CMYK output.  Black
-     generation is now performed in the color code rather than the
-     dither code.  This simplifies the dither code, puts the CMYK
-     generation where it should be, and improves overall flexibility.
+----------------
 
-  8) Complete overhaul of the multi-tone (photo or quadtone) ink
-     processing architecture (channels).  Instead of being processed
-     as part of the dithering code as in 4.2, where ink drops of
-     lighter inks were assigned virtual values proportional to their
-     darkness as well as their size, this is now processed after the
-     initial color conversion.  This has a number of major advantages:
+A) BASIC PRINTER OPTIONS
 
-     * As the actual amount of ink to be printed is visible to the
-       color code, the color code can do ink limiting without fear
-       that the dither code will change the amount of ink to be
-       printed.
+    These options control basic printer functions.
 
-     * It ensures that the same proportions of inks will be printed at
-       any density and resolution.  In 4.2, the ramp from light to
-       dark ink varied depending upon the dot sizes available and
-       hence the resolution.  This has already been demonstrated to
-       yield much better linearity and much more neutral gray scale
-       with even very modest tuning effort.
+        Printer Model
 
-     * It enables use of all drop sizes of all ink tones.  In 4.2, we
-       could not use the smallest drop size of dark ink, because the
-       virtual dot size of a small dot of dark ink is typically close
-       to the virtual dot size of a large dot of small ink.  This
-       would yield very sharp transition, and perhaps even result in
-       more light ink printed in darker regions than in lighter
-       regions.  With channel processing separate from dithering, this
-       concern no longer exists; we can safely use small drops of dark
-       ink, improving smoothness.
+                Select the printer to use.  It must always be
+                supplied.  When using CUPS or Foomatic, the printer
+                will automatically be selected via the chosen PPD
+                file; with the Print plugin for the GIMP, it is
+                selected in the Setup Printer dialog.
 
-     * It enables the color code to do ink limiting intelligently
-       without concern that the dither code will rearrange things
-       behind its back.
+        Page Size
 
-     * It greatly simplifies the specification of inks.  With drop
-       size and darkness orthogonal, family drivers can greatly
-       simplify their tables of inks.
+                Select the paper (media) size to print to.  Some
+                printers support custom paper sizes, while others only
+                support certain preset sizes.  This must always be
+                supplied.
 
-     * Dither algorithms can choose to ignore smaller drop sizes if
-       they wish to offer fast operation.
+                Note that this option refers to the actual size of the
+                media, not the printable area.  For example, selecting
+                A4 refers to actual A4 paper, whatever the margins may
+                be.
 
-     * Applications with special requirements can now access the raw
-       ink channels directly.  This facility was used to create a
-       mechanism to more accurately tune printer inks.
+        Double-Sided Printing
 
-  9) The color system can now generate arbitrary ink colors, lifting
-     the CMYK-only restriction in previous versions of the package.
-     This permits full support for the Epson Stylus Photo R800 and
-     R1800, which use red and blue ink in addition to the traditional
-     CMYK.
+                Otherwise known as "duplex" printing, this is offered
+                for printers capable of printing on both sides of the
+                page.  In addition to single-sided printing, there are
+                two modes of duplex operation: the page may be flipped
+                over its long edge (like a book), or over the short
+                edge (like a note pad; this is sometimes referred to
+                as Tumble).
 
-  10) Use of true XML to store data about printers and paper sizes, and
-     to represent new data types (sequences, curves, and arrays).
-     This uses the "mxml" XML library, a fast, lightweight XML parser
-     written by Mike Sweet for this project.  Currently, the use of
-     XML (as opposed to compiled-in data) is limited, but we expect
-     that this will change beyond the initial 5.0 release.
+		This option is new to Gutenprint 5.0.
 
-  10) In addition to parameters, internal components such as family
-     drivers, color drivers, etc. can store arbitrary data in the
-     basic stp_vars_t object.  This facility is used to simplify the
-     internal driver API; the family driver no longer needs to keep
-     track of dither, color, etc. information itself.
+        Media Type
 
-  11) The Epson Stylus family driver has been decomposed into more
-     functionally distinct units.  The data schema has been
-     considerably improved, and the code itself broken into more
-     easily maintained units.
+                Select the kind of paper or other media being printed
+                to.  This enables the printer and driver to be set up
+                appropriately for the kind of paper in use.  Most
+                printers offer a choice of supported media types.
 
-  12) The build system has been updated with a more contemporary
-     toolchain based on autoconf 2.5 and gettext 0.11.
+                It is important to set the Media Type to the correct
+                value if possible, or if not to a closely related
+                medium.  The printer may need to know what kind of
+                media is in use to determine how to feed the paper
+                correctly; the driver needs to know in order to select
+                the right output settings.
 
-  13) The Print plugin for the GIMP has been decomposed into a UI
-     library and the core plugin.  The user interface library is a
-     pure GTK-based library; the tiny GIMP plugin is a client of this
-     library.
+        Media Source
 
-  14) Printer characteristics are exposed to the application level as
-     read-only parameters.  This permits the escputil utility to not
-     duplicate information stored in the printer driver.
-================================================================
+                Select the source of the paper or other media.  This
+                option is offered with printers that have multiple
+                feeds, for example multiple paper bins, manual feed,
+                printing directly to a CD, etc.
 
-Known Build/Installation Issues
-
-    This section describes a number of issues that have been
-    encountered while building or installing Gutenprint.  If any of
-    these apply to you, please read the notes carefully.  The issues
-    are:
-
-    1) Building escputil may fail, or escputil may fail to run.
-
-    2) CUPS PPD files may not be translated (there may be multiple
-       versions of the PPD files, all in English).
-
-    3) Build/installation of Foomatic data may happen correctly, but
-       the generated PPD files do not work correctly.
-
-    Detailed descriptions of these issues follow.
+        Ink Set
 
-    * There is a known complication building "escputil" that causes
-      problems on some systems.  "escputil" uses the "readline"
-      package, to support command editing and history within the
-      program.  Unfortunately, linking programs with "readline" often
-      requires linking against additional libraries, and the exact
-      library depends upon the system (e. g. not all Linux systems
-      have the same requirements).
-
-      The configure script attempts to determine which additional
-      library must be linked against.  It tries using the following
-      libraries in this order to build a test executable:
-
-      -lncurses
-      -lcurses
-      -ltermcap
-      no additional libraries
-
-      The reason it tries other libraries first is that some systems
-      will link successfully, but only fail when an attempt is made to
-      actually call readline.  Therefore, we assume that additional
-      libraries are required.  Since we try the extra libraries in
-      order from most recent to oldest, we expect that the first one
-      we find will be appropriate.  For example, if the "ncurses"
-      library is the standard on a given system, the "termcap" library
-      may be provided for back compatibility, but it is unlikely that
-      "termcap" will be the standard with "curses" or "ncurses" being
-      provided for compatibility only (so that the link will succeed
-      but the command will use the incorrect library).
-
-      As this procedure is not failsafe, we provide the following
-      configure options to control this behavior:
-
-      ./configure --with-readline=yes  (the default; attempts to
-				       determine the correct library
-				       to link against)
-
-      ./configure --with-readline=no   (turns off use of readline
-				       altogether)
-
-      ./configure --with-readline=only (specifically instructs
-				       configure to not attempt to
-				       link against any other
-				       libraries)
-
-      ./configure --with-readline=libs (specifies the libraries to be
-				       linked against)
-
-      An hypothetical (this won't work anywhere!) example of the
-      latter would be
-
-      ./configure --with-readline='-lncurses -ltermcap'
-
-      Note that configure will not allow readline to be used if it
-      cannot successfully build the test program, regardless of the
-      option selected.  If you are having difficulty getting escputil
-      to build, we suggest using --with-readline=no.  The commands
-      used within escputil are very short and seldom require
-      significant editing.
-
-    * There is a known translation problem building the PPD files used
-      by the CUPS driver such that on many systems all of the PPD
-      files are in the English language.  This causes CUPS tools, such
-      as KUPS or http://localhost:631 to display many copies of each
-      PPD file, all in the English (en) language.  In fact, the PPD
-      files should be translated into many different languages.
-
-      The PPD files are created by a program named "genppd" in the
-      src/cups directory.  This program is called once for each
-      language, and creates all of the PPD files for the language in
-      one shot.
-
-      The command 'zgrep' can be used to determine if genppd is
-      creating the PPD files correctly, as follows:
-
-	  src/cups$ zgrep LanguageVersion ppd/*/pcl-4.ppd.gz
-	  ppd/C/pcl-4.ppd.gz:*LanguageVersion: English
-	  ppd/da/pcl-4.ppd.gz:*LanguageVersion: Danish
-	  ppd/en_GB/pcl-4.ppd.gz:*LanguageVersion: English-GB
-	  ...
-
-      If the PPD file for each language has a different language
-      version, the genppd program operated correctly.  If instead the
-      output looks like this:
-
-	  src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd.gz
-	  ppd/C/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
-	  ppd/da/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
-	  ppd/en_GB/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English
-	  ...
-
-      the program did not operate correctly.
-
-      If you do not have 'zgrep' on your system, you can gunzip the
-      PPD files, and use
-
-	  grep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd
-
-      to accomplish the same test.
-
-      The normal mechanism for performing translations is to set the
-      LANG environment variable to the appropriate language prior to
-      running the program.  This normally causes the program to search
-      the translations (normally in /usr/share/locale or
-      /usr/lib/locale) for the chosen language.  When a specially
-      marked string is used, a special macro calls `gettext()' on the
-      string to retrieve the translation, and substitutes the
-      translation for the string in question.
-
-      There are two problems with this approach in the context of
-      genppd.  The translation engine is intended to be used after
-      installation, not during build, and this causes problems.
-
-      1) At the time genppd is run, the translations have not been
-         installed in the normal system directories.  Fortunately,
-         it's possible to tell the translation machinery (via
-         bindtextdomain) to look elsewhere for the translation
-         catalogs.  What we do is install the catalogs in a temporary
-         directory under src/cups, and tell genppd to instruct the
-         translation machinery to look there.  This workaround is
-         straightforward, and doesn't normally cause problems.
-
-      2) LANG only lets us pick a valid locale (normally determined by
-         listing the directories in /usr/share/locale or
-         /usr/lib/locale).  Unfortunately, while language codes (which
-         form the base of locales) are standard, the actual locale
-         names aren't always.  On some systems, the locale names are
-         just the language base names; on others, they are the
-         language names concatenated with country codes (e. g. en_US),
-         while on others they are language codes concatenated with
-         character sets.  We are not aware of any workaround for this,
-         possibly short of actually running make install and then
-         rebuilding the PPD's.  'make install' will install the
-         message catalogs, and that may create the necessary locale
-         directories.  This is not exactly a very elegant approach.
-
-      The GNU gettext library (libintl.a) provides another environment
-      variable, LANGUAGE, which unconditionally looks up translations
-      according to the language, ignoring LANG and the LC_*
-      environment variables that are normally used for translation.
-      This library is no longer included with Gutenprint
-      (--with-included-gettext will not work).  Install the GNU
-      gettext package first if you need libintl.a.  Many systems
-      provide translation machinery in their standard libraries, and
-      it may not always be best to use foreign libraries to replace
-      standard system functionality.
-
-      We have chosen to use LANGUAGE for this purpose, as the GNU
-      gettext library appears to offer the most reliable translation,
-      and LANGUAGE appears to offer the most reliable mechanism.  We
-      have actually found that LANG and LC_* can interfere with
-      LANGUAGE, thus we do not use both.
-
-      To determine if the translations are working, you must actually
-      inspect the PPD files.  You will need to
-
-      cd src/cups/ppd/sv
-      gunzip *
-      more *
-
-      or the like to determine if this is successful.  In particular,
-      look for LanguageVersion, and make sure that it is correct (it
-      should be "Swedish" in the sv directory, for example), and also
-      make sure that the paper sizes are also translated.  We
-      currently suggest using the Swedish translation for this purpose
-      as it is the most complete.
-
-      If packagers find that the PPD files are all in English, rather
-      than translated into the appropriate languages, we suggest the
-      following:
-
-      1) Install GNU gettext (libintl).  If your system is not based
-         on GNU libc (Linux usually is based on GNU libc; BSD,
-         Solaris, IRIX, etc. are not), you will need this to have any
-         possibility of creating the translated PPD files.
-
-      2) Run 'make install' to install the package (including the
-         message catalogs) onto the system first, and then do the
-         following:
-
-	 cd src/cups
-	 rm ppd-stamp
-	 make
-
-	 to rebuild the PPD files.  Having the message catalogs on the
-	 system may permit this to succeed.
-
-      3) Ensure that your system actually has locales named 'sv',
-         'pl', and all of the other supported languages, and change
-         LANGUAGE to something more appropriate (most likely LANG,
-         LC_MESSAGES, or LC_ALL).
-
-      4) Build the PPD files on a Linux-based system; they are
-         portable.
-
-      5) Use --disable-translated-cups-ppds on the configure command line
-         to suppress the translated PPD files altogether.
-
-      Please feel free to contact us about this issue.
-
-    * There are multiple issues that one must be aware of when using
-      Foomatic with Gutenprint.
-
-      1) Before installing Gutenprint 5.0.0-rc1, you must manually
-	 remove any existing Foomatic option files.  This is because the
-	 Foomatic utility to load data kits (foomatic-kitload) does not
-	 remove obsolete data files from the Foomatic database.  If you
-	 do not do this, any PPD files you generate will be incorrect
-	 and printing may work incorrectly or not at all.
-
-	 Foomatic option files are usually located in 
-
-	 /usr/local/share/foomatic/db/source/opt
-
-	 or
-
-	 /usr/share/foomatic/db/source/opt
-
-	 Assuming they're in the former location, you must remove data
-	 files associated with the Gutenprint driver.  The command to do
-	 this, which must be run as the superuser (root) is
-
-	 cd /usr/local/share/foomatic/db/source/opt
-	 ls -l gutenprint-ijs*.xml
-
-	 If there are existing files present, you must remove them:
-
-	 rm -f gutenprint-ijs*.xml
-
-	 Now check to make sure that they are gone:
-
-	 ls -l gutenprint-ijs*.xml
-
-	 CAUTION: Be very careful when typing this command!  Minor
-	 errors in typing these commands may result in severe damage to
-	 your system.  The Gutenprint installation program does not do
-	 this automatically because there is currently no reliable way
-	 to detect where the Foomatic data files are installed.
+                Select the kind of ink in use in the printer, for
+                printers offering different optional inks (for
+                example, ink designed for matte paper vs. ink designed
+                for glossy paper).
 
-	 After this, you may run 'make install' in your Gutenprint
-	 source directory to install the package.  You will then need to
-	 re-create any printer queues using Foomatic.
+		This option is new to Gutenprint 5.0.
 
-	 In general, you will have to perform this procedure any time
-	 you install a new version of Gutenprint.
+        Borderless
 
-	 Please check the Foomatic site
-	 (http://www.linuxprinting.org/foomatic.html) and the Gutenprint
-	 site (http://gimp-print.sourceforge.net) for updated
-	 instructions about this.
+                Select whether to print with borders or not, for
+                printers with the capability to print to the edge of
+                the page.  This is otherwise known as "full bleed".
 
-      2) Unlike with the CUPS native driver, there is no simple way to
-	 update all PPD files when you install a new version of
-	 Gutenprint.  You must either use the foomatic-ppdfile command
-	 to upgrade PPD files individually, or foomatic-compiledb to
-	 build all PPD files.  The name of the driver in the Foomatic
-	 database is "gutenprint-ijs.5.0".
+		This option is new to Gutenprint 5.0.
 
-         The Foomatic data is version locked to the Gutenprint release
-	 installed on the system.  For example, PPD files generated
-	 with the Foomatic data for this release will not work with
-	 the ijsgutenprint in the next release.  This is to prevent
-	 accidentally using incorrect data, which could cause
-	 incorrect function to take place.
-================================================================
+        Resolution
 
+                Select the resolution to print at (dots per inch).  In
+                general, higher resolutions produce better quality, at
+                the expense of additional time.
 
-Supported Printers:
+                As a general rule of thumb, on laser printers and
+                older inkjet printers resolutions of 300 DPI or
+                thereabouts provide draft quality; lower resolutions
+                provide economy draft quality and cannot produce solid
+                black.  Resolutions of 600 or 720 DPI produce good
+                quality output; higher resolutions are useful for very
+                high quality image or graphic output.  Newer inkjet
+                printers, with smaller ink drop sizes, typically
+                require higher resolutions to produce acceptable
+                output; in some cases even 1440x720 DPI does not
+                produce good quality.
 
-Many variations on these printers are also supported.  Generally, the
-Epson printers are fully supported, although not fully tuned in all
-cases; the Canon, HP, and Lexmark printers vary.
+                Users of Epson inkjet printers have another setting
+                available: the Quality option can be used to
+                indirectly control the printer resolution, among other
+                things.  This offers a simpler way to control output
+                quality.
 
-Our practice is to provide preliminary support for printers as soon as
-we have information sufficient to code a functioning driver, and to
-release this support even in an otherwise stable release.  In this
-case, we note in the list below that support for a particular printer
-is "Experimental".  It is likely that printers that are supported in
-"Experimental" mode will produce poor quality at some or all
-resolutions and in addition may not function correctly at some
-resolutions.  Experimental Epson printers are most likely to produce
-good output at the highest resolution offered (2880x720, 2880x1440, or
-2880x2880 DPI), since in general these printers will not use multiple
-drop sizes at such high resolutions.
 
-Note that Gutenprint supports only the printer in multi-function
-devices -- this package does not support scanning, fax, copying, or
-any other function.  For scanning, please visit the SANE project
-(http://www.sane-project.org).
+----------------
 
-Please see the printer-specific notes section following the list of
-printers for any instructions specific to your printer.
-
-PostScript level 1        (GIMP Plugin only)
-PostScript level 2        (GIMP Plugin only)
-Apple Color StyleWriter 4100   (same as HP DeskJet 660C)
-Apple Color StyleWriter 4500   (same as HP DeskJet 690C)
-Apple Color StyleWriter 6500   (same as HP Deskjet 850C)
-Canon BJC 30
-Canon BJC 50
-Canon BJC 55
-Canon BJC 80
-Canon BJC 85
-Canon BJC 210
-Canon BJC 240
-Canon BJC 250
-Canon BJC 1000
-Canon BJC 2000
-Canon BJC 3000
-Canon BJC 4300
-Canon BJC 4400 photo
-Canon BJC 6000
-Canon BJC 6100
-Canon BJC 7000
-Canon BJC 7100
-Canon BJC 8200
-Canon CP-100 series
-Canon CP-220 series
-Canon S200            (Experimental)
-Canon S400
-Canon S450
-Canon S800
-Canon S4500
-Canon PIXMA iP4000    (Experimental)
-EPSON Stylus C20SX
-EPSON Stylus C20UX
-EPSON Stylus C40SX
-EPSON Stylus C40UX
-EPSON Stylus C41SX
-EPSON Stylus C41UX
-EPSON Stylus C42SX
-EPSON Stylus C42UX
-EPSON Stylus C43SX
-EPSON Stylus C43UX
-EPSON Stylus C44SX
-EPSON Stylus C44UX
-EPSON Stylus C45
-EPSON Stylus C46
-EPSON Stylus C48
-EPSON Stylus C50
-EPSON Stylus C60
-EPSON Stylus C61
-EPSON Stylus C62
-EPSON Stylus C63
-EPSON Stylus C64
-EPSON Stylus C65
-EPSON Stylus C66
-EPSON Stylus C68
-EPSON Stylus C70
-EPSON Stylus C80
-EPSON Stylus C82
-EPSON Stylus C83
-EPSON Stylus C84
-EPSON Stylus C85
-EPSON Stylus C86
-EPSON Stylus C87
-EPSON Stylus C88
-EPSON Stylus Color
-EPSON Stylus Color Pro
-EPSON Stylus Color Pro XL
-EPSON Stylus Color 400
-EPSON Stylus Color 440
-EPSON Stylus Color 460
-EPSON Stylus Color 480
-EPSON Stylus Color 500
-EPSON Stylus Color 580
-EPSON Stylus Color 600
-EPSON Stylus Color 640
-EPSON Stylus Color 660
-EPSON Stylus Color 670
-EPSON Stylus Color 680/777
-EPSON Stylus Color 740
-EPSON Stylus Color 760
-EPSON Stylus Color 800
-EPSON Stylus Color 850
-EPSON Stylus Color 860
-EPSON Stylus Color 880
-EPSON Stylus Color 83
-EPSON Stylus Color 900
-EPSON Stylus Color 980
-EPSON Stylus Color 1160
-EPSON Stylus Color 1500
-EPSON Stylus Color 1520
-EPSON Stylus Color 3000
-EPSON Stylus Photo
-EPSON Stylus Photo 700
-EPSON Stylus Photo EX
-EPSON Stylus Photo EX3
-EPSON Stylus Photo 720
-EPSON Stylus Photo 750
-EPSON Stylus Photo 780/785/790
-EPSON Stylus Photo 810/820
-EPSON Stylus Photo 825/830
-EPSON Stylus Photo 870/875
-EPSON Stylus Photo 890/895
-EPSON Stylus Photo 900
-EPSON Stylus Photo 915
-EPSON Stylus Photo 925
-EPSON Stylus Photo 935
-EPSON Stylus Photo 950
-EPSON Stylus Photo 960
-EPSON Stylus Photo 1200
-EPSON Stylus Photo 1270
-EPSON Stylus Photo 1280/1290
-EPSON Stylus Photo 2000P
-EPSON Stylus Photo 2100
-EPSON Stylus Photo 2200
-EPSON Stylus Photo R200
-EPSON Stylus Photo R210
-EPSON Stylus Photo R220
-EPSON Stylus Photo R300
-EPSON Stylus Photo R310
-EPSON Stylus Photo R320
-EPSON Stylus Photo R340
-EPSON Stylus Photo RX400
-EPSON Stylus Photo RX420
-EPSON Stylus Photo RX425
-EPSON Stylus Photo RX430
-EPSON Stylus Photo RX500
-EPSON Stylus Photo RX510
-EPSON Stylus Photo RX600
-EPSON Stylus Photo RX620
-EPSON Stylus Photo RX630
-EPSON Stylus Photo RX700 (Experimental)
-EPSON Stylus Photo R800
-EPSON Stylus Photo R1800
-EPSON Stylus Photo R2400 (Experimental)
-EPSON Stylus Pro 5000
-EPSON Stylus Pro 5500
-EPSON Stylus Pro 7000
-EPSON Stylus Pro 7500
-EPSON Stylus Pro 7600
-EPSON Stylus Pro 9000
-EPSON Stylus Pro 9500
-EPSON Stylus Pro 9600
-EPSON Stylus Pro 10000
-EPSON Stylus Scan 2000
-EPSON Stylus Scan 2500
-EPSON Stylus CX-1500
-EPSON Stylus CX-3100
-EPSON Stylus CX-3200
-EPSON Stylus CX-3500
-EPSON Stylus CX-3600
-EPSON Stylus CX-3650
-EPSON Stylus CX-3700
-EPSON Stylus CX-3800
-EPSON Stylus CX-3805
-EPSON Stylus CX-3810
-EPSON Stylus CX-4100
-EPSON Stylus CX-4200
-EPSON Stylus CX-4500
-EPSON Stylus CX-4600
-EPSON Stylus CX-4700
-EPSON Stylus CX-4800
-EPSON Stylus CX-5100
-EPSON Stylus CX-5200
-EPSON Stylus CX-5300
-EPSON Stylus CX-5400
-EPSON Stylus CX-5700
-EPSON Stylus CX-5800
-EPSON Stylus CX-6300
-EPSON Stylus CX-6400
-EPSON Stylus CX-6500
-EPSON Stylus CX-6600
-EPSON Stylus CX-7700
-EPSON Stylus CX-7800
-EPSON Stylus CX-8300
-EPSON Stylus CX-8400
-EPSON Stylus D68
-EPSON Stylus D88
-EPSON Stylus DX-3800
-EPSON Stylus DX-3850
-EPSON Stylus DX-4200
-EPSON Stylus DX-4250
-EPSON Stylus DX-4800
-EPSON PictureMate
-EPSON CL-700
-EPSON CL-750
-EPSON CL-760    (Experimental)
-EPSON EM-900C
-EPSON EM-930C
-EPSON MC-2000
-EPSON MC-5000
-EPSON MC-7000
-EPSON MC-9000
-EPSON MC-10000
-EPSON MJ-930C
-EPSON MJ-5100C
-EPSON MJ-6000C
-EPSON MJ-8000C
-EPSON PM-700C
-EPSON PM-730C
-EPSON PM-740C   (Experimental)
-EPSON PM-750C
-EPSON PM-760C
-EPSON PM-770C
-EPSON PM-780C
-EPSON PM-790PT
-EPSON PM-800C
-EPSON PM-850PT
-EPSON PM-870C   (Experimental)
-EPSON PM-880C
-EPSON PM-930C   (Experimental)
-EPSON PM-940C   (Experimental)
-EPSON PM-950C
-EPSON PM-970C   (Experimental)
-EPSON PM-980C   (Experimental)
-EPSON PM-2000C
-EPSON PM-2200C
-EPSON PM-3000C
-EPSON PM-3300C
-EPSON PM-3500C
-EPSON PM-3700C  (Experimental)
-EPSON PM-4000PX
-EPSON PM-5000C
-EPSON PM-7000C
-EPSON PM-9000C
-EPSON PM-10000
-EPSON PM-A900
-EPSON PM-D750
-EPSON PM-D770
-EPSON PM-D1000
-EPSON PM-G700
-EPSON PM-G720
-EPSON PM-G800   (Experimental)
-EPSON PM-G820   (Experimental)
-EPSON PX-A650
-EPSON PX-G900
-EPSON PX-G5000
-EPSON PX-V500
-EPSON PX-V600
-EPSON PX-5500
-EPSON PX-7000
-EPSON PX-9000
-Fujifilm Printpix CX-400
-Fujifilm Printpix CX-550
-HP DeskJet 340
-HP DeskJet 400
-HP DeskJet 500
-HP DeskJet 500C
-HP DeskJet 520
-HP DeskJet 540C
-HP DeskJet 550C
-HP DeskJet 560C
-HP DeskJet 600/600C (Single Cartridge)
-HP DeskJet 600 series (2 Cartridge)
-HP DeskJet 690 series (Photo-Ink capable)
-HP DesignJet 230
-HP DesignJet 250
-HP DesignJet 430
-HP DesignJet 450
-HP DesignJet 455
-HP DesignJet 488
-HP DesignJet 700
-HP DesignJet 750
-HP DesignJet 2500
-HP DesignJet 3500
-HP DeskJet 810C
-HP DeskJet 812C
-HP DeskJet 840C
-HP DeskJet 842C
-HP DeskJet 845C
-HP DeskJet 850C
-HP DeskJet 855C
-HP DeskJet 870C
-HP DeskJet 890C
-HP DeskJet 895C
-HP DeskJet 900 series
-HP PhotoSmart P1000
-HP DeskJet 1100C
-HP PhotoSmart P1100
-HP DeskJet 1120C
-HP DeskJet 1200C
-HP DeskJet 1220C
-HP DeskJet 1600C
-HP DeskJet 2000 series
-HP DeskJet 2500 series
-HP LaserJet II series
-HP LaserJet IIP series
-HP LaserJet III series
-HP LaserJet 4 series
-HP LaserJet 4V, 4Si
-HP LaserJet 5 series
-HP LaserJet 5Si
-HP LaserJet 6 series
-Lexmark 4076
-Lexmark Z42
-Lexmark Z43
-Lexmark Z52
-Lexmark Z53
-Olympus P-10 series
-Olympus P-200
-Olympus P-300 series
-Olympus P-400
-Olympus P-440
-Sony UP-DP10    (Experimental)
-Sony UP-DR150   (Experimental)
+B) ADVANCED PRINTER OPTIONS
 
-The following is the complete list of printers believed to be
-compatible with Gutenprint, along with recommended drivers.  Some of
-these printers may work only partially; the specified drivers may not
-support the full range of resolutions, paper sizes, media sources,
-etc. that some of these printers may offer.
+    These options control less frequently used printer options.  All
+    of these options are new to Gutenprint 5.0.
+
+        CD Hub Size
+
+                This setting may be used on printers with the
+                capability to print directly to a CD.  Depending upon
+                your choice of media, you may be able to safely print
+                all the way to the inner hole of the CD, or you may
+                not be able to print any closer than the hub about an
+                inch from the center.
+
+        CD Horizontal Fine Adjustment
+        CD Vertical Fine Adjustment
+
+                These settings allow you to shift the position of the
+                print while printing to a CD.  If you find that your
+                print is not centered on the CD surface, you may need
+                to adjust these setting to compensate.
 
-Printer Name                   Driver Name     Driver Description
-------- ----                   ------ ----     ------ -----------
-Apollo P-2100                  pcl-690         HP DeskJet 690 series
-Apollo P-2150                  pcl-690         HP DeskJet 690 series
-Apollo P-2200                  pcl-690         HP DeskJet 690 series
-Apollo P-2250                  pcl-690         HP DeskJet 690 series
-Apollo P-2500                  pcl-690         HP DeskJet 690 series
-Apollo P-2550                  pcl-690         HP DeskJet 690 series
-Apollo P-2600                  pcl-690         HP DeskJet 690 series
-Apollo P-2650                  pcl-690         HP DeskJet 690 series
-Apple Color StyleWriter 4100   pcl-apple-4100  HP LaserJet II series
-Apple Color StyleWriter 4500   pcl-apple-4500  HP LaserJet II series
-Apple Color StyleWriter 6500   pcl-apple-6500  HP LaserJet II series
-Apple LaserWriter Select 360   pcl-2           HP LaserJet II series
-Brother DCP-1200               pcl-2           HP LaserJet II series
-Brother HL-4Ve                 pcl-2           HP LaserJet II series
-Brother HL-10h                 pcl-4           HP LaserJet 4 series
-Brother HL-10V                 pcl-3           HP LaserJet III series
-Brother HL-630                 pcl-2           HP LaserJet II series
-Brother HL-660                 pcl-4           HP LaserJet 4 series
-Brother HL-760                 pcl-4           HP LaserJet 4 series
-Brother HL-960                 pcl-4           HP LaserJet 4 series
-Brother HL-1040                pcl-2           HP LaserJet II series
-Brother HL-1050                pcl-4           HP LaserJet 4 series
-Brother HL-1060                pcl-4           HP LaserJet 4 series
-Brother HL-1070                pcl-4           HP LaserJet 4 series
-Brother HL-1240                pcl-2           HP LaserJet II series
-Brother HL-1250                pcl-4           HP LaserJet 4 series
-Brother HL-1260                pcl-4           HP LaserJet 4 series
-Brother HL-1270N               pcl-4           HP LaserJet 4 series
-Brother HL-1440                pcl-4           HP LaserJet 4 series
-Brother HL-1660e               pcl-4           HP LaserJet 4 series
-Brother HL-2060                pcl-4           HP LaserJet 4 series
-Brother MFC-6550MC             pcl-2           HP LaserJet II series
-Brother MFC-8300               pcl-3           HP LaserJet III series
-Brother MFC-9500               pcl-2           HP LaserJet II series
-Brother MFC-9600               pcl-2           HP LaserJet II series
-Canon BJ-30                    bjc-30          Canon BJC 30
-Canon BJC-50                   bjc-50          Canon BJC 50
-Canon BJC-55                   bjc-55          Canon BJC 55
-Canon BJC-80                   bjc-80          Canon BJC 80
-Canon BJC-85                   bjc-85          Canon BJC 85
-Canon BJC-210                  bjc-210         Canon BJC 210
-Canon BJC-240                  bjc-240         Canon BJC 240
-Canon BJC-250                  bjc-250         Canon BJC 250
-Canon BJC-1000                 bjc-1000        Canon BJC 1000
-Canon BJC-2000                 bjc-2000        Canon BJC 2000
-Canon BJC-2010                 bjc-2000        Canon BJC 2000
-Canon BJC-2100                 bjc-4300        Canon BJC 4300
-Canon BJC-2110                 bjc-2000        Canon BJC 2000
-Canon BJC-3000                 bjc-3000        Canon BJC 3000
-Canon BJC-4000                 bjc-4300        Canon BJC 4300
-Canon BJC-4300                 bjc-4300        Canon BJC 4300
-Canon BJC-4400                 bjc-4400        Canon BJC 4400 photo
-Canon BJC-6000                 bjc-6000        Canon BJC 6000
-Canon BJC-6100                 bjc-6100        Canon BJC 6100
-Canon BJC-6200                 bjc-6200        Canon BJC 6200
-Canon BJC-6500                 bjc-6500        Canon BJC 6500
-Canon BJC-7000                 bjc-7000        Canon BJC 7000
-Canon BJC-7100                 bjc-7100        Canon BJC 7100
-Canon BJC-8200                 bjc-8200        Canon BJC 8200
-Canon CP-100                   canon-cp100     Canon CP100
-Canon CP-200                   canon-cp100     Canon CP100
-Canon CP-300                   canon-cp100     Canon CP100
-Canon CP-220                   canon-cp220     Canon CP220
-Canon CP-330                   canon-cp220     Canon CP220
-Canon SELPHY CP-400            canon-cp220     Canon SELPHY CP400
-Canon SELPHY CP-500            canon-cp220     Canon SELPHY CP500
-Canon SELPHY CP-510            canon-cp220     Canon SELPHY CP510
-Canon SELPHY CP-600            canon-cp220     Canon SELPHY CP600
-Canon SELPHY CP-710            canon-cp220     Canon SELPHY CP710
-Canon GP 335                   pcl-4           HP LaserJet 4 series
-Canon LBP-4sx                  pcl-3           HP LaserJet III series
-Canon LBP-430                  pcl-4l          HP LaserJet 4L
-Canon LBP-1000                 pcl-6           HP LaserJet 6 series
-Canon LBP-1260                 pcl-6           HP LaserJet 6 series
-Canon LBP-1760                 pcl-6           HP LaserJet 6 series
-Canon S100                     bjc-4300        Canon BJC 4300
-Canon S200                     bjc-s200        Canon S200
-Canon S300                     bjc-s800        Canon S800
-Canon S400                     bjc-s400        Canon S400
-Canon S450                     bjc-s450        Canon S450
-Canon S500                     bjc-8200        Canon BJC 8200
-Canon S600                     bjc-8200        Canon BJC 8200
-Canon S630                     bjc-8200        Canon BJC 8200
-Canon S800                     bjc-s800        Canon S800
-Canon S4500                    bjc-s4500       Canon S4500
-Canon PIXMA iP4000             bjc-iP4000      Canon PIXMA iP4000
-Canon imageRunner 330s         pcl-4           HP LaserJet 4 series
-Citizen ProJet II              pcl-2           HP LaserJet II series
-DEC 1800                       pcl-3           HP LaserJet III series
-DEC LN17                       pcl-4           HP LaserJet 4 series
-Epson ActionLaser 1100         pcl-3           HP LaserJet III series
-Epson ActionLaser II           pcl-2           HP LaserJet II series
-Epson AcuLaser C2000           pcl-4           HP LaserJet 4 series
-Epson AcuLaser C2000PS         pcl-4           HP LaserJet 4 series
-Epson AcuLaser C8500           pcl-4           HP LaserJet 4 series
-Epson AcuLaser C8500PS         pcl-4           HP LaserJet 4 series
-Epson AcuLaser C8600           pcl-4           HP LaserJet 4 series
-Epson AcuLaser C8600PS         pcl-4           HP LaserJet 4 series
-Epson EPL-5200                 pcl-3           HP LaserJet III series
-Epson EPL-5200+                pcl-3           HP LaserJet III series
-Epson EPL-5700                 pcl-4           HP LaserJet 4 series
-Epson EPL-5700PS               pcl-4           HP LaserJet 4 series
-Epson EPL-5800                 pcl-4           HP LaserJet 4 series
-Epson EPL-5800PS               pcl-4           HP LaserJet 4 series
-Epson EPL-5900                 pcl-4           HP LaserJet 4 series
-Epson EPL-5900PS               pcl-4           HP LaserJet 4 series
-Epson EPL-6100                 pcl-4           HP LaserJet 4 series
-Epson EPL-6100PS               pcl-4           HP LaserJet 4 series
-Epson EPL-7100                 pcl-2           HP LaserJet II series
-Epson Stylus C20SX             escp2-c20sx     EPSON Stylus C20SX
-Epson Stylus C20UX             escp2-c20ux     EPSON Stylus C20UX
-Epson Stylus C40SX             escp2-c40sx     EPSON Stylus C40SX
-Epson Stylus C40UX             escp2-c40ux     EPSON Stylus C40UX
-Epson Stylus C41SX             escp2-c41sx     EPSON Stylus C41SX
-Epson Stylus C41UX             escp2-c41ux     EPSON Stylus C41UX
-Epson Stylus C42SX             escp2-c42sx     EPSON Stylus C42SX
-Epson Stylus C42UX             escp2-c42ux     EPSON Stylus C42UX
-Epson Stylus C43SX             escp2-c43sx     EPSON Stylus C43SX
-Epson Stylus C43UX             escp2-c43ux     EPSON Stylus C43UX
-Epson Stylus C44SX             escp2-c44sx     EPSON Stylus C44SX
-Epson Stylus C44UX             escp2-c44ux     EPSON Stylus C44UX
-Epson Stylus C45               escp2-c45       EPSON Stylus C45
-Epson Stylus C46               escp2-c46       EPSON Stylus C46
-Epson Stylus C48               escp2-c48       EPSON Stylus C48
-Epson Stylus C50               escp2-c50       EPSON Stylus C50
-Epson Stylus C60               escp2-c60       EPSON Stylus C60
-Epson Stylus C61               escp2-c61       EPSON Stylus C61
-Epson Stylus C62               escp2-c62       EPSON Stylus C62
-Epson Stylus C63               escp2-c63       EPSON Stylus C63
-Epson Stylus C64               escp2-c64       EPSON Stylus C64
-Epson Stylus C65               escp2-c65       EPSON Stylus C65
-Epson Stylus C66               escp2-c66       EPSON Stylus C66
-Epson Stylus C68               escp2-c68       EPSON Stylus C68
-Epson Stylus C70               escp2-c70       EPSON Stylus C70
-Epson Stylus C80               escp2-c80       EPSON Stylus C80
-Epson Stylus C82               escp2-c82       EPSON Stylus C82
-Epson Stylus C83               escp2-c83       EPSON Stylus C83
-Epson Stylus C84               escp2-c84       EPSON Stylus C84
-Epson Stylus C85               escp2-c85       EPSON Stylus C85
-Epson Stylus C86               escp2-c86       EPSON Stylus C86
-Epson Stylus C88               escp2-c88       EPSON Stylus C88
-Epson Stylus Color             escp2           EPSON Stylus Color
-Epson Stylus Color I           escp2           EPSON Stylus Color
-Epson Stylus Color II          escp2           EPSON Stylus Color
-Epson Stylus Color IIs         escp2           EPSON Stylus Color
-Epson Stylus Color PRO         escp2-pro       EPSON Stylus Color Pro
-Epson Stylus Color Pro XL      escp2-pro-xl    EPSON Stylus Color Pro XL
-Epson Stylus Color 400         escp2-400       EPSON Stylus Color 400
-Epson Stylus Color 440         escp2-440       EPSON Stylus Color 440
-Epson Stylus Color 460         escp2-460       EPSON Stylus Color 460
-Epson Stylus Color 480         escp2-480       EPSON Stylus Color 480
-Epson Stylus Color 500         escp2-500       EPSON Stylus Color 500
-Epson Stylus Color 580         escp2-580       EPSON Stylus Color 580
-Epson Stylus Color 600         escp2-600       EPSON Stylus Color 600
-Epson Stylus Color 640         escp2-640       EPSON Stylus Color 640
-Epson Stylus Color 660         escp2-660       EPSON Stylus Color 660
-Epson Stylus Color 670         escp2-670       EPSON Stylus Color 670
-Epson Stylus Color 680         escp2-680       EPSON Stylus Color 680
-Epson Stylus Color 740         escp2-740       EPSON Stylus Color 740
-Epson Stylus Color 760         escp2-760       EPSON Stylus Color 760
-Epson Stylus Color 777         escp2-777       EPSON Stylus Color 777
-Epson Stylus Color 8 3         escp2-83        EPSON Stylus Color 83
-Epson Stylus Color 800         escp2-800       EPSON Stylus Color 800
-Epson Stylus Color 850         escp2-850       EPSON Stylus Color 850
-Epson Stylus Color 860         escp2-860       EPSON Stylus Color 860
-Epson Stylus Color 880         escp2-880       EPSON Stylus Color 880
-Epson Stylus Color 900         escp2-900       EPSON Stylus Color 900
-Epson Stylus Color 980         escp2-980       EPSON Stylus Color 980
-Epson Stylus Color 1160        escp2-1160      EPSON Stylus Color 1160
-Epson Stylus Color 1500        escp2-1500      EPSON Stylus Color 1500
-Epson Stylus Color 1520        escp2-1520      EPSON Stylus Color 1520
-Epson Stylus Color 3000        escp2-3000      EPSON Stylus Color 3000
-Epson Stylus Photo             escp2-photo     EPSON Stylus Photo
-Epson Stylus Photo 700         escp2-700       EPSON Stylus Photo 700
-Epson Stylus Photo 720         escp2-720       EPSON Stylus Photo 720
-Epson Stylus Photo 750         escp2-750       EPSON Stylus Photo 750
-Epson Stylus Photo 780         escp2-780       EPSON Stylus Photo 780
-Epson Stylus Photo 785         escp2-785       EPSON Stylus Photo 785EPX
-Epson Stylus Photo 790         escp2-790       EPSON Stylus Photo 790
-Epson Stylus Photo 810         escp2-810       EPSON Stylus Photo 810
-Epson Stylus Photo 820         escp2-820       EPSON Stylus Photo 820
-Epson Stylus Photo 825         escp2-825       EPSON Stylus Photo 825
-Epson Stylus Photo 830         escp2-830       EPSON Stylus Photo 830
-Epson Stylus Photo 870         escp2-870       EPSON Stylus Photo 870
-Epson Stylus Photo 875         escp2-875       EPSON Stylus Photo 875
-Epson Stylus Photo 890         escp2-890       EPSON Stylus Photo 890
-Epson Stylus Photo 895         escp2-895       EPSON Stylus Photo 895
-Epson Stylus Photo 900         escp2-ph900     EPSON Stylus Photo 900
-Epson Stylus Photo 915         escp2-915       EPSON Stylus Photo 915
-Epson Stylus Photo 925         escp2-925       EPSON Stylus Photo 925
-Epson Stylus Photo 935         escp2-935       EPSON Stylus Photo 935
-Epson Stylus Photo 950         escp2-950       EPSON Stylus Photo 950
-Epson Stylus Photo 960         escp2-960       EPSON Stylus Photo 960
-Epson Stylus Photo 1200        escp2-1200      EPSON Stylus Photo 1200
-Epson Stylus Photo 1270        escp2-1270      EPSON Stylus Photo 1270
-Epson Stylus Photo 1280        escp2-1280      EPSON Stylus Photo 1280
-Epson Stylus Photo 1290        escp2-1290      EPSON Stylus Photo 1290
-Epson Stylus Photo 2000P       escp2-2000      EPSON Stylus Photo 2000P
-Epson Stylus Photo 2100        escp2-2100      EPSON Stylus Photo 2100
-Epson Stylus Photo 2200        escp2-2200      EPSON Stylus Photo 2200
-Epson Stylus Photo EX          escp2-ex        EPSON Stylus Photo EX
-Epson Stylus Photo EX3         escp2-ex3       EPSON Stylus Photo EX3
-Epson Stylus Photo R200        escp2-r200      EPSON Stylus Photo R200
-Epson Stylus Photo R210        escp2-r210      EPSON Stylus Photo R210
-Epson Stylus Photo R220        escp2-r220      EPSON Stylus Photo R220
-Epson Stylus Photo R300        escp2-r300      EPSON Stylus Photo R300
-Epson Stylus Photo R310        escp2-r310      EPSON Stylus Photo R310
-Epson Stylus Photo R320        escp2-r320      EPSON Stylus Photo R320
-Epson Stylus Photo R340        escp2-r340      EPSON Stylus Photo R340
-Epson Stylus Photo RX400       escp2-rx400     EPSON Stylus Photo RX400
-Epson Stylus Photo RX420       escp2-rx420     EPSON Stylus Photo RX420
-Epson Stylus Photo RX425       escp2-rx425     EPSON Stylus Photo RX425
-Epson Stylus Photo RX430       escp2-rx430     EPSON Stylus Photo RX430
-Epson Stylus Photo RX500       escp2-rx500     EPSON Stylus Photo RX500
-Epson Stylus Photo RX510       escp2-rx510     EPSON Stylus Photo RX510
-Epson Stylus Photo RX600       escp2-rx600     EPSON Stylus Photo RX600
-Epson Stylus Photo RX620       escp2-rx620     EPSON Stylus Photo RX620
-Epson Stylus Photo RX630       escp2-rx630     EPSON Stylus Photo RX630
-Epson Stylus Photo RX700       escp2-rx700     EPSON Stylus Photo RX700
-Epson Stylus Photo R800        escp2-r800      EPSON Stylus Photo R800
-Epson Stylus Photo R1800       escp2-r1800     EPSON Stylus Photo R1800
-Epson Stylus Photo R2400       escp2-r2400     EPSON Stylus Photo R2400
-Epson Stylus Pro 5000          escp2-5000      EPSON Stylus Pro 5000
-Epson Stylus Pro 5500          escp2-5500      EPSON Stylus Pro 5500
-Epson Stylus Pro 7000          escp2-7000      EPSON Stylus Pro 7000
-Epson Stylus Pro 7500          escp2-7500      EPSON Stylus Pro 7500
-Epson Stylus Pro 7600          escp2-7600      EPSON Stylus Pro 7600
-Epson Stylus Pro 9000          escp2-9000      EPSON Stylus Pro 9000
-Epson Stylus Pro 9500          escp2-9500      EPSON Stylus Pro 9500
-Epson Stylus Pro 9600          escp2-9600      EPSON Stylus Pro 9600
-Epson Stylus Pro 10000         escp2-10000     EPSON Stylus Pro 10000
-Epson Stylus Scan 2000         escp2-scan2000  EPSON Stylus Scan 2000
-Epson Stylus Scan 2500         escp2-scan2500  EPSON Stylus Scan 2500
-Epson Stylus CX1500            escp2-cx1500    EPSON Stylus CX-1500
-Epson Stylus CX3100            escp2-cx3100    EPSON Stylus CX-3100
-Epson Stylus CX3200            escp2-cx3200    EPSON Stylus CX-3200
-Epson Stylus CX3500            escp2-cx3500    EPSON Stylus CX-3500
-Epson Stylus CX3600            escp2-cx3600    EPSON Stylus CX-3600
-Epson Stylus CX3650            escp2-cx3650    EPSON Stylus CX-3650
-Epson Stylus CX3700            escp2-cx3700    EPSON Stylus CX-3700
-Epson Stylus CX3800            escp2-cx3800    EPSON Stylus CX-3800
-Epson Stylus CX3805            escp2-cx3805    EPSON Stylus CX-3805
-Epson Stylus CX3810            escp2-cx3810    EPSON Stylus CX-3810
-Epson Stylus CX4100            escp2-cx4100    EPSON Stylus CX-4100
-Epson Stylus CX4200            escp2-cx4200    EPSON Stylus CX-4200
-Epson Stylus CX4500            escp2-cx4500    EPSON Stylus CX-4500
-Epson Stylus CX4600            escp2-cx4600    EPSON Stylus CX-4600
-Epson Stylus CX4700            escp2-cx4700    EPSON Stylus CX-4700
-Epson Stylus CX4800            escp2-cx4800    EPSON Stylus CX-4800
-Epson Stylus CX5100            escp2-cx5100    EPSON Stylus CX-5100
-Epson Stylus CX5200            escp2-cx5200    EPSON Stylus CX-5200
-Epson Stylus CX5300            escp2-cx5300    EPSON Stylus CX-5300
-Epson Stylus CX5400            escp2-cx5400    EPSON Stylus CX-5400
-Epson Stylus CX5700            escp2-cx5700    EPSON Stylus CX-5700
-Epson Stylus CX5800            escp2-cx5800    EPSON Stylus CX-5800
-Epson Stylus CX6300            escp2-cx6300    EPSON Stylus CX-6300
-Epson Stylus CX6400            escp2-cx6400    EPSON Stylus CX-6400
-Epson Stylus CX6500            escp2-cx6500    EPSON Stylus CX-6500
-Epson Stylus CX6600            escp2-cx6600    EPSON Stylus CX-6600
-Epson Stylus CX7700            escp2-cx7700    EPSON Stylus CX-7700
-Epson Stylus CX7800            escp2-cx7800    EPSON Stylus CX-7800
-Epson Stylus CX8300            escp2-cx8300    EPSON Stylus CX-8300
-Epson Stylus CX8400            escp2-cx8400    EPSON Stylus CX-8400
-Epson Stylus D68               escp2-d68       EPSON Stylus D68
-Epson Stylus D88               escp2-d88       EPSON Stylus D88
-Epson Stylus DX3800            escp2-dx3800    EPSON Stylus DX-3800
-Epson Stylus DX3850            escp2-dx3850    EPSON Stylus DX-3850
-Epson Stylus DX4200            escp2-dx4200    EPSON Stylus DX-4200
-Epson Stylus DX4250            escp2-dx4250    EPSON Stylus DX-4250
-Epson Stylus DX4800            escp2-dx4800    EPSON Stylus DX-4800
-Epson PictureMate              escp2-picmate   EPSON PictureMate
-Epson PictureMate Deluxe       escp2-picmated  EPSON PictureMate Deluxe
-Epson CL-700                   escp2-cl700     EPSON CL-700
-Epson CL-750                   escp2-cl750     EPSON CL-750
-Epson CL-760                   escp2-cl760     EPSON CL-760
-Epson EM-900C                  escp2-em900c    EPSON EM-900C
-Epson EM-930C                  escp2-em930c    EPSON EM-930C
-Epson E-100                    escp2-e100      EPSON E-100
-Epson MC-2000                  escp2-mc2000    EPSON MC-2000
-Epson MC-5000                  escp2-mc5000    EPSON MC-5000
-Epson MC-7000                  escp2-mc7000    EPSON MC-7000
-Epson MC-9000                  escp2-mc9000    EPSON MC-9000
-Epson MC-10000                 escp2-mc10000   EPSON MC-10000
-Epson MJ-930C                  escp2-mj930c    EPSON MJ-930C
-Epson MJ-5100C                 escp2-mj5100c   EPSON MJ-5100C
-Epson MJ-6000C                 escp2-mj6000c   EPSON MJ-6000C
-Epson MJ-8000C                 escp2-mj8000c   EPSON MJ-8000C
-Epson PM-700C                  escp2-pm700c    EPSON PM-700C
-Epson PM-730C                  escp2-pm730c    EPSON PM-730C
-Epson PM-740C                  escp2-pm740c    EPSON PM-740C
-Epson PM-750C                  escp2-pm750c    EPSON PM-750C
-Epson PM-760C                  escp2-pm760c    EPSON PM-760C
-Epson PM-770C                  escp2-pm770c    EPSON PM-770C
-Epson PM-780C                  escp2-pm780c    EPSON PM-780C
-Epson PM-790PT                 escp2-pm790pt   EPSON PM-790PT
-Epson PM-800C                  escp2-pm800c    EPSON PM-800C
-Epson PM-850PT                 escp2-pm850pt   EPSON PM-850PT
-Epson PM-870C                  escp2-pm870c    EPSON PM-870C
-Epson PM-880C                  escp2-pm880c    EPSON PM-880C
-Epson PM-930C                  escp2-pm930c    EPSON PM-930C
-Epson PM-940C                  escp2-pm940c    EPSON PM-940C
-Epson PM-950C                  escp2-pm950c    EPSON PM-950C
-Epson PM-970C                  escp2-pm970c    EPSON PM-970C
-Epson PM-980C                  escp2-pm980c    EPSON PM-980C
-Epson PM-2000C                 escp2-pm2000c   EPSON PM-2000C
-Epson PM-2200C                 escp2-pm2200c   EPSON PM-2200C
-Epson PM-3000C                 escp2-pm3000c   EPSON PM-3000C
-Epson PM-3300C                 escp2-pm3300c   EPSON PM-3300C
-Epson PM-3500C                 escp2-pm3500c   EPSON PM-3500C
-Epson PM-3700C                 escp2-pm3700c   EPSON PM-3700C
-Epson PM-4000PX                escp2-pm4000px  EPSON PM-4000PX
-Epson PM-5000C                 escp2-pm5000c   EPSON PM-5000C
-Epson PM-7000C                 escp2-pm7000c   EPSON PM-7000C
-Epson PM-9000C                 escp2-pm9000c   EPSON PM-9000C
-Epson PM-10000                 escp2-pm10000   EPSON PM-10000
-Epson PM-A900                  escp2-pma900    EPSON PM-A900
-Epson PM-D750                  escp2-pmd750    EPSON PM-D750
-Epson PM-D770                  escp2-pmd770    EPSON PM-D770
-Epson PM-D1000                 escp2-pmd1000   EPSON PM-D1000
-Epson PM-G700                  escp2-pmg700    EPSON PM-G700
-Epson PM-G720                  escp2-pmg720    EPSON PM-G720
-Epson PM-G800                  escp2-pmg800    EPSON PM-G800
-Epson PM-G820                  escp2-pmg820    EPSON PM-G820
-Epson PX-A650                  escp2-pxa650    EPSON PX-A650
-Epson PX-G900                  escp2-pxg900    EPSON PX-G900
-Epson PX-G920                  escp2-pxg920    EPSON PX-G920
-Epson PX-G5000                 escp2-pxg5000   EPSON PX-G5000
-Epson PX-V500                  escp2-pxv500    EPSON PX-V500
-Epson PX-V600                  escp2-pxv600    EPSON PX-V600
-Epson PX-5500                  escp2-px5500    EPSON PX-5500
-Epson PX-7000                  escp2-px7000    EPSON PX-7000
-Epson PX-9000                  escp2-px9000    EPSON PX-9000
-Fujifilm Printpix CX-400       fujifilm-cx400  Fujifilm Printpix CX-400
-Fujifilm Printpix CX-550       fujifilm-cx550  Fujifilm Printpix CX-550
-Fujitsu PrintPartner 10V       pcl-4           HP LaserJet 4 series
-Fujitsu PrintPartner 16DV      pcl-4           HP LaserJet 4 series
-Fujitsu PrintPartner 20W       pcl-6           HP LaserJet 6 series
-Fujitsu PrintPartner 8000      pcl-3           HP LaserJet III series
-HP 2000C                       pcl-2000        HP DeskJet 2000 series
-HP 2500C                       pcl-2500        HP DeskJet 2500 series
-HP 2500CM                      pcl-2500        HP DeskJet 2500 series
-HP Business Inkjet 2200        pcl-900         HP DeskJet 900 series
-HP Business Inkjet 2230        pcl-900         HP DeskJet 900 series
-HP Business Inkjet 2250        pcl-900         HP DeskJet 900 series
-HP Business Inkjet 2250TN      pcl-900         HP DeskJet 900 series
-HP Business Inkjet 2280        pcl-900         HP DeskJet 900 series
-HP Color Inkjet Printer CP1160 pcl-900         HP DeskJet 900 series
-HP Color Inkjet Printer CP1700 pcl-900         HP DeskJet 900 series
-HP Color LaserJet 5            pcl-3           HP LaserJet III series
-HP Color LaserJet 2500         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 4500         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 4550         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 4600         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 5000         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 5500         pcl-4           HP LaserJet 4 series
-HP Color LaserJet 8550GN       pcl-4           HP LaserJet 4 series
-HP DesignJet 230               pcl-desnj-230   HP DesignJet 230
-HP DesignJet 250C              pcl-desnj-250   HP DesignJet 250
-HP DesignJet 430               pcl-desnj-430   HP DesignJet 430
-HP DesignJet 450C              pcl-desnj-450   HP DesignJet 450
-HP DesignJet 455CA             pcl-desnj-455   HP DesignJet 455
-HP DesignJet 488CA             pcl-desnj-488   HP DesignJet 488
-HP DesignJet 700               pcl-desnj-700   HP DesignJet 700
-HP DesignJet 750C              pcl-750         HP DesignJet 750C
-HP DesignJet 750C Plus         pcl-750         HP DesignJet 750C
-HP DesignJet 2500CP            pcl-desnj-2500  HP DesignJet 2500
-HP DesignJet 3500CP            pcl-desnj-3500  HP DesignJet 3500
-HP DesignJet ColorPro CAD      pcl-2500        HP DesignJet ColorPro CAD
-HP DeskJet 340C                pcl-340         HP DeskJet 340
-HP DeskJet 400                 pcl-400         HP DeskJet 400
-HP DeskJet 400C                pcl-540         HP DeskJet 540C
-HP DeskJet 420C                pcl-540         HP DeskJet 540C
-HP DeskJet 450                 pcl-900         HP DeskJet 900 series
-HP DeskJet 500                 pcl-500         HP DeskJet 500
-HP DeskJet 500C                pcl-501         HP DeskJet 500C
-HP DeskJet 505J Plus           pcl-500         HP DeskJet 500
-HP DeskJet 510                 pcl-500         HP DeskJet 500
-HP DeskJet 520                 pcl-520         HP DeskJet 520
-HP DeskJet 540C                pcl-540         HP DeskJet 540C
-HP DeskJet 550C                pcl-550         HP DeskJet 550C
-HP DeskJet 560C                pcl-560         HP DeskJet 560C
-HP DeskJet 600                 pcl-600         HP DeskJet 600/600C
-HP DeskJet 610C                pcl-601         HP DeskJet 690 series
-HP DeskJet 610CL               pcl-601         HP DeskJet 690 series
-HP DeskJet 612C                pcl-601         HP DeskJet 690 series
-HP DeskJet 640C                pcl-601         HP DeskJet 690 series
-HP DeskJet 648C                pcl-601         HP DeskJet 690 series
-HP DeskJet 660C                pcl-601         HP DeskJet 600 series
-HP DeskJet 670C                pcl-601         HP DeskJet 600 series
-HP DeskJet 670TV               pcl-601         HP DeskJet 600 series
-HP DeskJet 672C                pcl-601         HP DeskJet 600 series
-HP DeskJet 680C                pcl-601         HP DeskJet 600 series
-HP DeskJet 682C                pcl-601         HP DeskJet 600 series
-HP DeskJet 690C                pcl-690         HP DeskJet 690 series
-HP DeskJet 692C                pcl-690         HP DeskJet 690 series
-HP DeskJet 693C                pcl-690         HP DeskJet 690 series
-HP DeskJet 694C                pcl-690         HP DeskJet 690 series
-HP DeskJet 695C                pcl-690         HP DeskJet 690 series
-HP DeskJet 697C                pcl-690         HP DeskJet 690 series
-HP DeskJet 810C                pcl-810         HP DeskJet 810C
-HP DeskJet 812C                pcl-812         HP DeskJet 812C
-HP DeskJet 815C                pcl-812         HP DeskJet 812C
-HP DeskJet 816C                pcl-812         HP DeskJet 812C
-HP DeskJet 825C                pcl-845         HP DeskJet 845C
-HP DeskJet 830C                pcl-810         HP DeskJet 810C
-HP DeskJet 832C                pcl-810         HP DeskJet 810C
-HP DeskJet 840C                pcl-840         HP DeskJet 840C
-HP DeskJet 841C                pcl-840         HP DeskJet 840C
-HP DeskJet 842C                pcl-842         HP DeskJet 842C
-HP DeskJet 843C                pcl-842         HP DeskJet 842C
-HP DeskJet 845C                pcl-845         HP DeskJet 845C
-HP DeskJet 850C                pcl-850         HP DeskJet 850C
-HP DeskJet 855C                pcl-855         HP DeskJet 855C
-HP DeskJet 870C                pcl-870         HP DeskJet 870C
-HP DeskJet 880C                pcl-810         HP DeskJet 810C
-HP DeskJet 882C                pcl-810         HP DeskJet 810C
-HP DeskJet 890C                pcl-890         HP DeskJet 890C
-HP DeskJet 895C                pcl-895         HP DeskJet 895C
-HP DeskJet 916C                pcl-900         HP DeskJet 900 series
-HP DeskJet 920C                pcl-900         HP DeskJet 900 series
-HP DeskJet 930C                pcl-900         HP DeskJet 900 series
-HP DeskJet 932C                pcl-900         HP DeskJet 900 series
-HP DeskJet 933C                pcl-900         HP DeskJet 900 series
-HP DeskJet 934C                pcl-900         HP DeskJet 900 series
-HP DeskJet 935C                pcl-900         HP DeskJet 900 series
-HP DeskJet 940C                pcl-900         HP DeskJet 900 series
-HP DeskJet 948C                pcl-900         HP DeskJet 900 series
-HP DeskJet 950C                pcl-900         HP DeskJet 900 series
-HP DeskJet 952C                pcl-900         HP DeskJet 900 series
-HP DeskJet 955C                pcl-900         HP DeskJet 900 series
-HP DeskJet 957C                pcl-900         HP DeskJet 900 series
-HP DeskJet 959C                pcl-900         HP DeskJet 900 series
-HP DeskJet 960C                pcl-900         HP DeskJet 900 series
-HP DeskJet 970C                pcl-900         HP DeskJet 900 series
-HP DeskJet 975C                pcl-900         HP DeskJet 900 series
-HP DeskJet 980C                pcl-900         HP DeskJet 900 series
-HP DeskJet 990C                pcl-900         HP DeskJet 900 series
-HP DeskJet 995C                pcl-900         HP DeskJet 900 series
-HP DeskJet 1100C               pcl-1100        HP DeskJet 1100C
-HP DeskJet 1120C               pcl-1120        HP DeskJet 1120C
-HP DeskJet 1125C               pcl-1120        HP DeskJet 1120C
-HP DeskJet 1200C               pcl-1200        HP DeskJet 1200C
-HP DeskJet 1220C               pcl-1220        HP DeskJet 1220C
-HP DeskJet 1600C               pcl-1600        HP DeskJet 1600C
-HP DeskJet 1600CM              pcl-1600        HP DeskJet 1600C
-HP DeskJet 3810                pcl-900         HP DeskJet 900 series
-HP DeskJet 3816                pcl-900         HP DeskJet 900 series
-HP DeskJet 3820                pcl-900         HP DeskJet 900 series
-HP DeskJet 3822                pcl-900         HP DeskJet 900 series
-HP DeskJet 5550                pcl-900         HP DeskJet 900 series
-HP DeskJet 5551                pcl-900         HP DeskJet 900 series
-HP DeskJet 6122                pcl-900         HP DeskJet 900 series
-HP DeskJet 6127                pcl-900         HP DeskJet 900 series
-HP DeskJet 9300                pcl-900         HP DeskJet 900 series
-HP E-printer E20               pcl-601         HP DeskJet 600 series
-HP LaserJet 2                  pcl-2           HP LaserJet II series
-HP LaserJet 2D                 pcl-2           HP LaserJet II series
-HP LaserJet 2P                 pcl-2p          HP LaserJet IIP series
-HP LaserJet 2P Plus            pcl-2p          HP LaserJet IIP series
-HP LaserJet 3                  pcl-3           HP LaserJet III series
-HP LaserJet 3D                 pcl-3           HP LaserJet III series
-HP LaserJet 3P w/ PCL5         pcl-4l          HP LaserJet 4L
-HP LaserJet 3P w/PS            pcl-3           HP LaserJet III series
-HP LaserJet 4                  pcl-4           HP LaserJet 4 series
-HP LaserJet 4 Plus             pcl-4           HP LaserJet 4 series
-HP LaserJet 4L                 pcl-4l          HP LaserJet 4L
-HP LaserJet 4M                 pcl-4           HP LaserJet 4 series
-HP LaserJet 4ML                pcl-4           HP LaserJet 4 series
-HP LaserJet 4P                 pcl-4           HP LaserJet 4 series
-HP LaserJet 4Si                pcl-4           HP LaserJet 4 series
-HP LaserJet 4V                 pcl-4v          HP LaserJet 4V, 4Si
-HP LaserJet 5                  pcl-5           HP LaserJet 5 series
-HP LaserJet 5L                 pcl-4           HP LaserJet 4 series
-HP LaserJet 5M                 pcl-4           HP LaserJet 4 series
-HP LaserJet 5MP                pcl-4           HP LaserJet 4 series
-HP LaserJet 5P                 pcl-5           HP LaserJet 5 series
-HP LaserJet 5Si                pcl-5si         HP LaserJet 5Si
-HP LaserJet 6                  pcl-6           HP LaserJet 6 series
-HP LaserJet 6L                 pcl-4           HP LaserJet 4 series
-HP LaserJet 6MP                pcl-4           HP LaserJet 4 series
-HP LaserJet 6P                 pcl-4           HP LaserJet 4 series
-HP LaserJet 1010               pcl-5           HP LaserJet 5 series
-HP LaserJet 1012               pcl-5           HP LaserJet 5 series
-HP LaserJet 1015               pcl-5           HP LaserJet 5 series
-HP LaserJet 1100               pcl-6           HP LaserJet 6 series
-HP LaserJet 1100A              pcl-6           HP LaserJet 6 series
-HP LaserJet 1150               pcl-6           HP LaserJet 6 series
-HP LaserJet 1200               pcl-6           HP LaserJet 6 series
-HP LaserJet 1220               pcl-6           HP LaserJet 6 series
-HP LaserJet 1300               pcl-6           HP LaserJet 6 series
-HP LaserJet 2100               pcl-6           HP LaserJet 6 series
-HP LaserJet 2100M              pcl-6           HP LaserJet 6 series
-HP LaserJet 2200               pcl-6           HP LaserJet 6 series
-HP LaserJet 2300               pcl-6           HP LaserJet 6 series
-HP LaserJet 3200               pcl-6           HP LaserJet 6 series
-HP LaserJet 3200m              pcl-6           HP LaserJet 6 series
-HP LaserJet 3200se             pcl-6           HP LaserJet 6 series
-HP LaserJet 3300 MFP           pcl-6           HP LaserJet 6 series
-HP LaserJet 3310 MFP           pcl-6           HP LaserJet 6 series
-HP LaserJet 3320 MFP           pcl-6           HP LaserJet 6 series
-HP LaserJet 3320N MFP          pcl-6           HP LaserJet 6 series
-HP LaserJet 3330 MFP           pcl-6           HP LaserJet 6 series
-HP LaserJet 4000               pcl-6           HP LaserJet 6 series
-HP LaserJet 4050               pcl-6           HP LaserJet 6 series
-HP LaserJet 4100               pcl-6           HP LaserJet 6 series
-HP LaserJet 4200               pcl-6           HP LaserJet 6 series
-HP LaserJet 4300               pcl-6           HP LaserJet 6 series
-HP LaserJet 5000               pcl-6           HP LaserJet 6 series
-HP LaserJet 5100               pcl-6           HP LaserJet 6 series
-HP LaserJet 8000               pcl-6           HP LaserJet 6 series
-HP LaserJet 8100               pcl-6           HP LaserJet 6 series
-HP LaserJet 8150               pcl-6           HP LaserJet 6 series
-HP LaserJet 9000               pcl-6           HP LaserJet 6 series
-HP Mopier 240                  pcl-6           HP LaserJet 6 series
-HP Mopier 320                  pcl-6           HP LaserJet 6 series
-HP OfficeJet                   pcl-520         HP DeskJet 520
-HP OfficeJet 300               pcl-520         HP DeskJet 520
-HP OfficeJet 330               pcl-520         HP DeskJet 520
-HP OfficeJet 350               pcl-520         HP DeskJet 520
-HP OfficeJet 500               pcl-601         HP DeskJet 600 series
-HP OfficeJet 520               pcl-601         HP DeskJet 600 series
-HP OfficeJet 570               pcl-601         HP DeskJet 600 series
-HP OfficeJet 580               pcl-601         HP DeskJet 600 series
-HP OfficeJet 590               pcl-601         HP DeskJet 600 series
-HP OfficeJet 600               pcl-601         HP DeskJet 600 series
-HP OfficeJet 610               pcl-601         HP DeskJet 600 series
-HP OfficeJet 625               pcl-601         HP DeskJet 600 series
-HP OfficeJet 630               pcl-601         HP DeskJet 600 series
-HP OfficeJet 635               pcl-601         HP DeskJet 600 series
-HP OfficeJet 700               pcl-690         HP DeskJet 690 series
-HP OfficeJet 710               pcl-690         HP DeskJet 690 series
-HP OfficeJet 720               pcl-690         HP DeskJet 690 series
-HP OfficeJet 725               pcl-690         HP DeskJet 690 series
-HP OfficeJet 5105              pcl-900         HP DeskJet 900 series
-HP OfficeJet 5110              pcl-900         HP DeskJet 900 series
-HP OfficeJet 5110xi            pcl-900         HP DeskJet 900 series
-HP OfficeJet 6105              pcl-900         HP DeskJet 900 series
-HP OfficeJet 6110              pcl-900         HP DeskJet 900 series
-HP OfficeJet 7110              pcl-900         HP DeskJet 900 series
-HP OfficeJet 7130              pcl-900         HP DeskJet 900 series
-HP OfficeJet 7140              pcl-900         HP DeskJet 900 series
-HP OfficeJet D125              pcl-900         HP DeskJet 900 series
-HP OfficeJet D135              pcl-900         HP DeskJet 900 series
-HP OfficeJet D145              pcl-900         HP DeskJet 900 series
-HP OfficeJet D155              pcl-900         HP DeskJet 900 series
-HP OfficeJet G55               pcl-900         HP DeskJet 900 series
-HP OfficeJet G85               pcl-900         HP DeskJet 900 series
-HP OfficeJet G95               pcl-900         HP DeskJet 900 series
-HP OfficeJet K60               pcl-900         HP DeskJet 900 series
-HP OfficeJet K60xi             pcl-900         HP DeskJet 900 series
-HP OfficeJet K80               pcl-900         HP DeskJet 900 series
-HP OfficeJet K80xi             pcl-900         HP DeskJet 900 series
-HP OfficeJet LX                pcl-520         HP DeskJet 520
-HP OfficeJet Pro 1150C         pcl-850         HP DeskJet 850C
-HP OfficeJet Pro 1170C         pcl-890         HP DeskJet 890C
-HP OfficeJet Pro 1175C         pcl-890         HP DeskJet 890C
-HP OfficeJet R40               pcl-810         HP DeskJet 810C
-HP OfficeJet R45               pcl-810         HP DeskJet 810C
-HP OfficeJet R60               pcl-810         HP DeskJet 810C
-HP OfficeJet R65               pcl-810         HP DeskJet 810C
-HP OfficeJet R80               pcl-810         HP DeskJet 810C
-HP OfficeJet T45               pcl-810         HP DeskJet 810C
-HP OfficeJet T65               pcl-810         HP DeskJet 810C
-HP OfficeJet V40               pcl-900         HP DeskJet 900 series
-HP OfficeJet V40xi             pcl-900         HP DeskJet 900 series
-HP PhotoSmart P100             pcl-900         HP DeskJet 900 series
-HP PhotoSmart P130             pcl-900         HP DeskJet 900 series
-HP PhotoSmart P230             pcl-900         HP DeskJet 900 series
-HP PhotoSmart P1000            pcl-P1000       HP PhotoSmart P1000
-HP PhotoSmart P1100            pcl-P1100       HP PhotoSmart P1100
-HP PhotoSmart P1115            pcl-900         HP DeskJet 900 series
-HP PhotoSmart P1215            pcl-900         HP DeskJet 900 series
-HP PhotoSmart P1218            pcl-900         HP DeskJet 900 series
-HP PhotoSmart P1315            pcl-900         HP DeskJet 900 series
-HP PhotoSmart 7150             pcl-900         HP DeskJet 900 series
-HP PhotoSmart 7345             pcl-900         HP DeskJet 900 series
-HP PhotoSmart 7350             pcl-900         HP DeskJet 900 series
-HP PhotoSmart 7550             pcl-900         HP DeskJet 900 series
-HP PSC 370                     pcl-690         HP DeskJet 690 series
-HP PSC 380                     pcl-690         HP DeskJet 690 series
-HP PSC 500                     pcl-810         HP DeskJet 810C
-HP PSC 750                     pcl-900         HP DeskJet 900 series
-HP PSC 950                     pcl-900         HP DeskJet 900 series
-HP PSC 950xi                   pcl-900         HP DeskJet 900 series
-HP PSC 2110                    pcl-900         HP DeskJet 900 series
-HP PSC 2150                    pcl-900         HP DeskJet 900 series
-HP PSC 2210                    pcl-900         HP DeskJet 900 series
-IBM 4019                       pcl-2           HP LaserJet II series
-IBM 4029 030 LaserPrinter 10   pcl-3           HP LaserJet III series
-IBM 4312                       pcl-4           HP LaserJet 4 series
-IBM Infoprint 12               pcl-6           HP LaserJet 6 series
-IBM Page Printer 3112          pcl-4           HP LaserJet 4 series
-Infotec 4651 MF                pcl-6           HP LaserJet 6 series
-Kyocera F-1010                 pcl-2           HP LaserJet II series
-Kyocera FS-600                 pcl-4           HP LaserJet 4 series
-Kyocera FS-600 KPDL 2          pcl-4           HP LaserJet 4 series
-Kyocera FS-680                 pcl-4           HP LaserJet 4 series
-Kyocera FS-800                 pcl-4           HP LaserJet 4 series
-Kyocera FS-1000                pcl-4           HP LaserJet 4 series
-Kyocera FS-1000+               pcl-4           HP LaserJet 4 series
-Kyocera FS-1010                pcl-4           HP LaserJet 4 series
-Kyocera FS-1050                pcl-4           HP LaserJet 4 series
-Kyocera FS-1200                pcl-4           HP LaserJet 4 series
-Kyocera FS-1600                pcl-4           HP LaserJet 4 series
-Kyocera FS-1600+               pcl-4           HP LaserJet 4 series
-Kyocera FS-1700                pcl-4           HP LaserJet 4 series
-Kyocera FS-1700+               pcl-4           HP LaserJet 4 series
-Kyocera FS-1750                pcl-4           HP LaserJet 4 series
-Kyocera FS-1800                pcl-4           HP LaserJet 4 series
-Kyocera FS-1800+               pcl-4           HP LaserJet 4 series
-Kyocera FS-1900                pcl-4           HP LaserJet 4 series
-Kyocera FS-3500                pcl-3           HP LaserJet III series
-Kyocera FS-3600                pcl-4           HP LaserJet 4 series
-Kyocera FS-3600+               pcl-4           HP LaserJet 4 series
-Kyocera FS-3700                pcl-4           HP LaserJet 4 series
-Kyocera FS-3700+               pcl-4           HP LaserJet 4 series
-Kyocera FS-3750                pcl-6           HP LaserJet 6 series
-Kyocera FS-3800                pcl-4           HP LaserJet 4 series
-Kyocera FS-5800C               pcl-4           HP LaserJet 4 series
-Kyocera FS-5900C               pcl-4           HP LaserJet 4 series
-Kyocera FS-6500                pcl-3           HP LaserJet III series
-Kyocera FS-6500+               pcl-3           HP LaserJet III series
-Kyocera FS-6700                pcl-4           HP LaserJet 4 series
-Kyocera FS-7000                pcl-4           HP LaserJet 4 series
-Kyocera FS-7000+               pcl-4           HP LaserJet 4 series
-Kyocera FS-8000C               pcl-4           HP LaserJet 4 series
-Kyocera FS-9000                pcl-4           HP LaserJet 4 series
-Kyocera FS-9100DN              pcl-4           HP LaserJet 4 series
-Kyocera FS-9500DN              pcl-4           HP LaserJet 4 series
-Kyocera KM-1530                pcl-4           HP LaserJet 4 series
-Kyocera KM-1810                pcl-4           HP LaserJet 4 series
-Kyocera KM-2030                pcl-4           HP LaserJet 4 series
-Kyocera KM-2530                pcl-4           HP LaserJet 4 series
-Kyocera KM-3530                pcl-4           HP LaserJet 4 series
-Kyocera KM-4230                pcl-4           HP LaserJet 4 series
-Kyocera KM-4530                pcl-4           HP LaserJet 4 series
-Kyocera KM-5230                pcl-4           HP LaserJet 4 series
-Kyocera KM-5530                pcl-4           HP LaserJet 4 series
-Kyocera KM-6230                pcl-4           HP LaserJet 4 series
-Lexmark 4076                   lexmark-4076    Lexmark 4076
-Lexmark Optra E                pcl-4           HP LaserJet 4 series
-Lexmark Optra E+               pcl-4           HP LaserJet 4 series
-Lexmark Valuewriter 300        pcl-2           HP LaserJet II series
-Lexmark Z42                    lexmark-z42     Lexmark Z42
-Lexmark Z43                    lexmark-z43     Lexmark Z43
-Lexmark Z52                    lexmark-z52     Lexmark Z52
-Lexmark Z53                    lexmark-z53     Lexmark Z53
-Minolta PagePro 6              pcl-4           HP LaserJet 4 series
-Minolta PagePro 6e             pcl-4           HP LaserJet 4 series
-Minolta PagePro 6ex            pcl-4           HP LaserJet 4 series
-Minolta PagePro 8              pcl-4           HP LaserJet 4 series
-Minolta PagePro 8L             pcl-2           HP LaserJet II series
-Minolta PagePro 1100           pcl-6           HP LaserJet 6 series
-NEC SuperScript 660i           pcl-4           HP LaserJet 4 series
-NEC SuperScript 860            pcl-2           HP LaserJet II series
-NEC SuperScript 870            pcl-2           HP LaserJet II series
-NEC SuperScript 1260           pcl-2           HP LaserJet II series
-NEC SuperScript 1400           pcl-4           HP LaserJet 4 series
-NEC SuperScript 1800           pcl-4           HP LaserJet 4 series
-Okidata OL400                  pcl-2           HP LaserJet II series
-Okidata OL400e                 pcl-2           HP LaserJet II series
-Okidata OL400ex                pcl-2           HP LaserJet II series
-Okidata OL410e                 pcl-4           HP LaserJet 4 series
-Okidata OL600e                 pcl-2           HP LaserJet II series
-Okidata OL610e/S               pcl-2           HP LaserJet II series
-Okidata OL800                  pcl-2           HP LaserJet II series
-Okidata OL810ex                pcl-4           HP LaserJet 4 series
-Okidata Okipage 6e             pcl-4           HP LaserJet 4 series
-Okidata Okipage 6ex            pcl-4           HP LaserJet 4 series
-Okidata Okipage 8p             pcl-4           HP LaserJet 4 series
-Okidata Okipage 10e            pcl-4           HP LaserJet 4 series
-Okidata Okipage 10ex           pcl-4           HP LaserJet 4 series
-Okidata Okipage 14ex           pcl-4           HP LaserJet 4 series
-Okidata Super 6e               pcl-4l          HP LaserJet 4L
-Olivetti JP350S                pcl-2           HP LaserJet II series
-Olivetti PG 306                pcl-2           HP LaserJet II series
-Olympus P-10                   olympus-p10     Olympus P10 
-Olympus P-11                   olympus-p10     Olympus P11 
-Olympus P-200                  olympus-p200    Olympus P200
-Olympus P-300E                 olympus-p300    Olympus P300
-Olympus P-300U                 olympus-p300    Olympus P300
-Olympus P-330E                 olympus-p300    Olympus P300
-Olympus P-330NE                olympus-p300    Olympus P300
-Olympus P-400                  olympus-p400    Olympus P400
-Olympus P-440                  olympus-p440    Olympus P440
-PCPI 1030                      pcl-2           HP LaserJet II series
-Panasonic KX-P4410             pcl-2           HP LaserJet II series
-Panasonic KX-P4450             pcl-3           HP LaserJet III series
-Panasonic KX-P6150             pcl-2           HP LaserJet II series
-Panasonic KX-P6500             pcl-2           HP LaserJet II series
-Raven LP-410                   pcl-2           HP LaserJet II series
-Ricoh Aficio 220               pcl-6           HP LaserJet 6 series
-Ricoh Aficio 401               pcl-4           HP LaserJet 4 series
-Ricoh Aficio 700               pcl-4           HP LaserJet 4 series
-Samsung ML-85                  pcl-4           HP LaserJet 4 series
-Samsung ML-4600                pcl-6           HP LaserJet 6 series
-Samsung ML-5000a               pcl-4           HP LaserJet 4 series
-Samsung ML-6000                pcl-4           HP LaserJet 4 series
-Samsung ML-6100                pcl-4           HP LaserJet 4 series
-Samsung ML-7000                pcl-6           HP LaserJet 6 series
-Samsung ML-7000N               pcl-6           HP LaserJet 6 series
-Samsung ML-7000P               pcl-6           HP LaserJet 6 series
-Samsung ML-7050                pcl-6           HP LaserJet 6 series
-Samsung QL-5100A               pcl-4           HP LaserJet 4 series
-Samsung QL-6050                pcl-4           HP LaserJet 4 series
-Seiko SpeedJET 200             pcl-2           HP LaserJet II series
-Sharp AR-161                   pcl-6           HP LaserJet 6 series
-Sony IJP-V100                  pcl-601         HP DeskJet 600 series
-Sony UP-DP10                   sony-updp10     Sony UP-DP10
-Sony UP-DR150                  sony-updr150    Sony UP-DR150
-Star LS-04                     pcl-2           HP LaserJet II series
-Star LaserPrinter 8            pcl-2           HP LaserJet II series
-Tally MT908                    pcl-3           HP LaserJet III series
-Xerox Able 1406                pcl-4           HP LaserJet 4 series
-Xerox DocuPrint C20            pcl-4           HP LaserJet 4 series
-Xerox DocuPrint P8e            pcl-4           HP LaserJet 4 series
-Xerox DocuPrint P12            pcl-2           HP LaserJet II series
-Xerox DocuPrint P1202          pcl-6           HP LaserJet 6 series
-Xerox DocuPrint 4508           pcl-4           HP LaserJet 4 series
-Xerox DocuPrint N4512          pcl-4           HP LaserJet 4 series
-Xerox DocuPrint N4512 PS       pcl-4           HP LaserJet 4 series
-Xerox Document Centre 400      pcl-4           HP LaserJet 4 series
-Generic PCL 4 Printer          pcl-2           HP LaserJet II series
-Generic PCL 5 Printer          pcl-4           HP LaserJet 4 series
-Generic PCL 5c Printer         pcl-4           HP LaserJet 4 series
-Generic PCL 5e Printer         pcl-4           HP LaserJet 4 series
-Generic PCL 6/PCL XL Printer   pcl-6           HP LaserJet 6 series
-================================================================
+        Enhanced Gloss
+
+                Some newer printers have a cartridge of "gloss
+                enhancer", which helps solve the problem of pigment
+                inks having an inconsistent lustre on glossy paper.
+                Use this option to enable use of the gloss enhancer.
+
+        Laminate Pattern
+
+                Some dye sublimation printers are able achieve better
+                durability of output by covering it with transparent
+                laminate surface. This surface can be of different
+                patterns: common are matte, glossy or texture.
+
+
+----------------
+
+C) SPECIALIZED PRINTER OPTIONS
+
+    These options control unusual printer features.  They may be
+    useful in certain circumstances; generally the default settings
+    will work optimally.
+
+        Ink Type
+
+                Select which subset of inks to use for printing.  For
+                example, on a photo printer with additional light cyan
+                and light magenta inks, it's possible to print with
+                only the standard cyan, magenta, yellow, and black
+                inks.
+
+                Normally there is no reason to use any setting other
+                than the default.  Reasons why one might want to use
+                it include:
+
+                1) Some black inks are not compatible with certain
+                   glossy papers.  If the black ink smudges on your
+                   paper, you may elect to use an option without black
+                   ink (a "composite" setting).
+
+                2) Some inks or paper/ink combinations produce color
+                   shifts when the light inks are used.  If your
+                   chosen combination produces unacceptable color
+                   shifts or color casts, you may prefer to use the
+                   Four Color Standard option, which will generally
+                   yield more consistent color at the expense of
+                   "grainier" output.
 
-Printer-Specific Notes:
-
-    * It is strongly recommended that four color mode not be used on
-      the Epson Stylus C63, C64, C65, C66, C70, C80, and CX-5200, and
-      the PX-V500 and PX-V600 when printing to glossy papers, as the
-      black ink is formulated differently from the color ink and does
-      not adhere properly to these papers.  Epson Photo Paper, Premium
-      Glossy Photo Paper, Premium Luster Photo Paper, and Premium
-      Semigloss Photo Paper are known to be affected.  If you use the
-      Standard ink type, this will be handled automatically.
-
-    * The Gutenprint driver does not in all cases offer the same set
-      of resolutions offered by the printer manufacturer's drivers.
-      There are a variety of reasons why that is the case:
-
-      1) In some cases, we have not determined the necessary commands
-         to utilize some resolutions (particularly very high
-         resolutions).
-
-      2) In some cases, the advertised printer resolution may not
-         match what we determine to be the maximum resolution based on
-         our understanding of the printer's capabilities.  Sometimes
-         the advertised resolution is qualified by a statement that
-         implies that the actual resolution may be different from the
-         stated resolution.  In some cases, we may be able to achieve
-         the same number of drops per square inch by means of a
-         different resolution.  For example, we may determine that a
-         printer that is advertised to support 5760x720 DPI in fact
-         supports 2880x1440 DPI.  This is the same number of droplets
-         per square inch (4147200), but with a different aspect ratio
-         (the ratio of the horizontal resolution to the vertical
-         resolution).
-
-      3) In some cases, we offer additional resolutions not offered by
-         the printer vendor.  These resolutions may be either lower or
-         higher than those offered by the printer vendor.
-
-	 We frequently offer lower resolutions than those offered by
-	 the printer vendor to offer a greater choice of printing
-	 speed.  These resolutions will offer low quality but very
-	 fast printing speed for use where the quality is unimportant
-	 but speed is of the greatest importance.
-
-	 In some cases, we offer resolutions higher (or simply
-	 different) than those advertised by printer vendors.  We will
-	 offer these options if testing determines that these
-	 resolutions can be used safely and we determine that these
-	 resolutions offer a potential benefit in quality in some
-	 cases.  For example, we offer resolutions of 2880x2880 and
-	 5760x2880 DPI on the Epson Stylus Photo R800 despite the
-	 advertised maximum resolution of 5760x1440 DPI.  Testing has
-	 verified that these resolutions do in fact operate correctly
-	 and offer benefit over lower resolutions.	 
-
-	 It is almost always better to have a printing resolution with
-	 a smaller aspect ratio (i. e. the horizontal and vertical
-	 resolutions are similar).  For example, a resolution of
-	 2880x1440 DPI is likely to yield superior results to a
-	 resolution of 5760x720 DPI.  Therefore, in some cases we do
-	 not offer certain resolutions offered by the printer vendor
-	 (in the case of the Epson Stylus Photo R800, 5760x1440 DPI)
-	 because they are not likely to yield any benefit (either
-	 speed or quality) over another resolution that we offer (in
-	 this case, 2880x2880 DPI).
-
-	 Indeed, we have received reports that in some cases a lower
-	 resolution may actually offer improved quality over a higher
-	 resolution.  For example, the Epson Stylus Photo 780 is
-	 reported to yield better quality at 1440x720 DPI Highest
-	 Quality than 2880x720 DPI.
-
-      We periodically evaluate the list of resolutions we offer to
-      decide whether to offer any additional options.
-
-    * Many Epson printers (specifically, the Epson Stylus Color 740
-      and all newer printers) will not respond to ASCII text without a
-      special "activation" sequence (specifically, this command takes
-      the printers out of "packet mode").  A brand new printer, or one
-      that has been connected to a Windows system, may or may not work
-      in packet mode.  Therefore, the common suggestion to test a
-      printer port by sending plain text to it may not work for these
-      printers; failure to print in this fashion is not a positive
-      indication that the printer or the connection is malfunctioning.
-      These printers are, however, able to print plain text *after*
-      the activation sequence is sent.
-
-      A suggestion would be to first verify that the printer is
-      capable of returning ink levels.  This may be done via
-
-      escputil -i -r /dev/lp0
-
-      (or whatever device your printer is connected to in place of
-      /dev/lp0).  If this returns status, it demonstrates that the
-      link between your computer and printer is working.
+        Printing Direction
+
+                Most inkjet printers can print either unidirectionally
+                (the head prints only when moving in one direction) or
+                bidirectionally (the head prints when moving in both
+                directions).  Bidirectional printing is generally
+                faster, since the printer is printing at all times
+                rather than wasting much of the time returning the
+                head to the starting position.  On many printers,
+                however, unidirectional printing produces better
+                quality output than bidirectional printing.
+
+                The standard setting for this option adapts to the
+                printing resolution.
+
+		This option is new to Gutenprint 5.0, but Gimp-Print
+		4.2 offered this option in the form of extra
+		resolution choices.
+
+        Interleave Method
+
+                Most inkjet printers create the printed image using
+                multiple overlapping passes of the print head.  On
+                many printers this function is performed within the
+                printer itself and cannot be adjusted, but with many
+                Epson inkjet printers (and some others), this is
+                performed by the driver or may be specified to the
+                printer.  One advantage of the multiple overlapping
+                passes is that it can hide small differences between
+                the individual print head nozzles, which would
+                otherwise be visible as banding.  The different
+                interleave methods are different strategies for
+                for performing this overlapping; some are better at
+                hiding the banding than others.  They all require the
+                same amount of time to print.
+
+                Generally it is not necessary to adjust this; in some
+                cases, depending upon your printer, you may find that
+                one pattern or another performs better.
+
+                On Epson Stylus Pro printers, this option allows
+                specifying different overlap patterns within the
+                printer.  In this case, the choice of overlap pattern
+                may affect both the printing time and the quality to a
+                significant degree.
+
+		This option is new to Gutenprint 5.0.
+
+        Adjust dot size as necessary
+
+                This option is provided on many Epson inkjet printers
+                to allow you to use larger ink drops than those
+                normally used for the resolution chosen.  This may be
+                necessary if you use certain kinds of media or for
+                some reason wish to use much more ink (higher density)
+                than the default.  It should not be necessary to use
+                this option.
+
+		This option is new to Gutenprint 5.0.
+
+
+----------------
+
+D) BASIC OUTPUT CONTROLS
+
+        Output Type
+
+                This option specifies whether to print in color or
+                black and white/grayscale (using only black inks).
+                Black and white printing is generally faster than
+                color printing, even if the item being printed is
+                entirely black and white.  However, printing with only
+                black ink may yield a "grainy" appearance.
+
+		This option was present in Gutenprint 4.2, but it
+		offered an additional option of "black and white",
+		which printed everything as either black or white (no
+		grayscale).  The Gutenprint 5.0 equivalent is to set
+		Color Correction to Threshold.
+
+        Color Correction
+
+                This selects the choice of color correction method
+                within Gutenprint.  The following options are
+                presently offered:
+
+                * DEFAULT: Select a color correction mode appropriate
+                  for the document type being printed.
+
+                * HIGH ACCURACY: Apply optimum color correction to the
+                  output to produce the best color quality.  This
+                  corrects the hue, brightness, and saturation
+                  (brilliance of color).  This is the normal setting
+                  to use for printing photographs or graphics if you
+                  are not using any external color management.
+
+                * BRIGHT COLORS: Apply color correction to the output,
+                  but generate more brilliant colors in some cases.
+
+                * CORRECT HUE ONLY: Apply color correction to the
+                  output, but correct only the hue.  This option does
+                  not correct brightness and saturation.
+
+                * UNCORRECTED: Do not apply any color correction to
+                  the output beyond generating linear output.  This is
+                  the best setting to use when utilizing external
+                  color management; the high accuracy modes employ
+                  correction algorithms that may not work well with
+                  color management.
+
+                  Note that if you use color management you should use
+                  profiles created with Gutenprint and with the exact
+                  settings that you plan to print with.  Profiles
+                  provided by the printer vendor are calibrated for
+                  the vendor's driver, which may not be identical to
+                  Gutenprint's calibration.  In addition, profiles
+                  created using Gimp-Print 4.2 or earlier will
+                  generally not perform well with Gutenprint 5.0.
+
+                * DESATURATED: Print in pure grayscale, but using
+                  color inks.  The result is somewhat different from
+                  printing in black and white using the Output Type
+                  option -- the driver may use color ink, which
+                  generates smoother output and may yield better
+                  results on many papers.
+
+                * THRESHOLD: Convert all colors to fully on or fully
+                  off, eliminating all gradual tonal gradations.  The
+                  result is that the output will consist of all very
+                  pure colors.
+
+                * DENSITY: Correct only the amount of ink ("density"),
+                  otherwise performing no correction at all, even for
+                  linearity.  Prints made with this option will
+                  usually be very dark if no other color management is
+                  used.  This may be useful if you are printing in 16
+                  bit precision or are using your own linearization
+                  curves.
+
+                * RAW: Perform no correction at all, even for
+                  density.  Prints made with this option will be very
+                  dark and may bleed (or even puddle!) ink if not used
+                  with external color management and linearization.
+                  This option may be useful if you are using external
+                  color management and linearization to get extremely
+                  saturated dark colors by using more ink in
+                  individual channels.  It should be used with extreme
+                  caution, as it is very easy to damage the printer if
+                  you are not careful.
+
+                * PRE-DITHERED: Interpret each pixel as the actual
+                  size of each drop to be printed.  Legal values of
+                  the drop sizes differ between printers; all printers
+                  support 0 (no droplet) and 1 (the largest droplet).
+                  Some printers support four levels (0, 1, 2, and 3).
+
+		This option is new to Gutenprint 5.0, but its function
+		was partially encompassed by the Image Type option.
+
+
+        Image Type
+
+                Specify the option that best describes your print job.
+                Your choice here will affect the processing of the
+                print job.  Currently available settings are:
+
+                * TEXT: Optimize the output for printing black text
+                  with no graphics.  This option results in crisp
+                  output and is very fast, but will yield very poor
+                  results with any color or grayscale graphics.
+
+                * GRAPHICS: Optimize the output for printing color
+                  graphics.  This option will generate smooth, bright
+                  output.
+
+                * MIXED TEXT AND GRAPHICS: Optimize the output for
+                  printing a mixture of text and graphics.
+
+                * PHOTOGRAPH: Optimize the output for printing
+                  photographs.  This option will generate smooth
+                  tones and high quality colors, but will be slower
+                  than the other options.
+
+                * LINE ART: Optimize the output for printing black and
+                  white line art with intricate detail.
+
+                * MANUAL CONTROL: Do not bias the output at all; use
+                  only the settings specified by the user.
+
+		This option was present in Gimp-Print 4.2, but with
+		fewer choices and more restrictions on their use.  Its
+		functioned more like the Color Correction option in
+		Gutenprint 5.0.
+
+
+        Print Quality
+
+                Specify the desired output quality using convenient
+                presets.  Where this option is available, Gutenprint
+                will automatically adjust the printing resolution and
+                other options to generate the desired quality.
+                Settings chosen with this option may be overridden by
+                explicitly setting other settings, such as resolution.
+                Not all printers offer all of these options.
+                Currently available settings, in increasing order of
+                quality, include:
+
+                * FAST ECONOMY: Use the fastest printing mode
+                  available on the printer to print with a minimum
+                  amount of ink.  This option will produce very washed
+                  out colors and grays, and will typically be
+                  extremely grainy and streaky.
+
+                * ECONOMY: Print very rapidly with a reduced amount of
+                  ink.  This option will produce washed out colors and
+                  grays and will typically be quite grainy and
+                  streaky.
+
+                * DRAFT: Print low quality draft output quickly.  This
+                  option will typically produce acceptable colors with
+                  some amount of grain on plain paper, but will
+                  typically produce washed out and grainy output on
+                  high quality papers.  On some printers this may
+                  employ a special draft mode to print especially
+                  quickly at the expense of color fidelity.
+
+                * STANDARD: Print at a normal quality level for text
+                  or text/graphics on plain paper or basic inkjet
+                  paper.  This option will typically produce
+                  acceptable colors, but on high quality papers the
+                  output may be grainy or somewhat washed out.  This
+                  option may also be useful for printing draft copies
+                  of photographs on coated inkjet paper.
+
+                * HIGH: Print final copies of text or text/graphics on
+                  plain paper or inkjet paper.  This option will
+                  typically produce good color quality, but the
+                  quality may not be optimal for photographs on glossy
+                  paper.  This option may also be useful for printing
+                  draft copies of photographs on glossy paper.
+
+                * PHOTO: Print photographs on glossy paper or very
+                  high quality text, text/graphics, or line art on
+                  high quality paper.  In the latter application this
+                  will produce output close to laser printer quality.
+                  On the highest quality premium papers the result may
+                  still be a bit grainy.
+
+                * SUPER PHOTO: Print photographs on glossy paper with
+                  very high quality.  This will generally yield very
+                  good results on high quality premium paper but may
+                  be overkill on other papers.  This option is only
+                  offered on printers capable of producing very high
+                  quality output rivaling traditional photographic
+                  printing.  This option may also be appropriate for
+                  very intricate line art, where the required
+                  resolution may exceed the capabilities of laser
+                  printers.
+
+                * ULTRA PHOTO: Print photographs on premium papers
+                  with extremely high quality.  This option is only
+                  offered on printers capable of producing extremely
+                  high quality output matching or exceeding
+                  traditional photographic printing.
+
+                * BEST: Print with the best quality available on the
+                  printer for the application chosen.  This may be
+                  equivalent to one of the other settings; on a very
+                  few printers the resolution may exceed that of Ultra
+                  Photo mode.
+
+                * MANUAL CONTROL: Do not adjust the settings at all;
+                  use only the settings specified by the user.
+
+		This option is new to Gutenprint 5.0.
+
+
+----------------
+
+E) BASIC OUTPUT ADJUSTMENTS
+
+        Saturation
+
+                This option controls the vividness of the output
+                color; higher values produce more vivid colors.  Very
+                low values produce muted colors; setting this to zero
+                produces gray.
+
+        Contrast
+
+                This controls the contrast of the output.  Lower
+                values produce less tonal range in the midtones
+                (lighter colors become darker, and darker colors
+                become lighter), which may allow for more definition
+                in the highlights and shadows.  Higher values do the
+                opposite: lighter colors become even lighter, while
+                darker colors become even darker.
+
+		This option behaves differently from its equivalent in
+		Gimp-Print 4.2.  In Gimp-Print 4.2, setting contrast
+		less than 1 changed the white point and black point:
+		white became light gray and black became dark gray.
+		In Gutenprint 5.0 this control changes the shape of
+		the curve, but the black and white points remain the
+		same.  The Linear Contrast Adjustment option described
+		below restores the Gimp-Print 4.2 behavior.
+
+        Brightness
+
+                This control adjusts the general brightness of the
+                print; higher values produce generally lighter output,
+                while lower values produce generally darker output.
+                White and black are not changed; colors also retain
+                their hue and saturation.
+
+		This option behaves differently from its equivalent in
+		Gimp-Print 4.2.  In Gimp-Print 4.2, setting brightness
+		greater than 1 caused black to print as gray, while
+		setting brightness to less than 1 caused white to
+		print as gray.  In Gutenprint 5.0 this control changes
+		the shape of the curve, but the black and white points
+		remain the same.
+
+
+----------------
+
+F) ADVANCED OUTPUT ADJUSTMENTS
+
+    These controls adjust more specialized settings.
+
+        Dither Algorithm
+
+                Since inkjet printers have a limited set of ink colors
+                (normally cyan, magenta, yellow, and black), most
+                colors have to be produced by mixing the available
+                inks.  This is done by printing patterns of very small
+                dots, fooling the eye into seeing many different
+                shades.  This process is called "dithering"; several
+                different patterns are available, with trade-offs
+                between speed and quality.  The following dither
+                algorithms are currently available.  If no algorithm
+                is selected, the driver chooses an appropriate one
+                based on other option settings.  The following
+                algorithms are currently available, generally in
+                increasing order of quality.
+
+                * VERY FAST: This algorithm produces very rough,
+                  patterned output, but is extremely fast.  This
+                  generally yields poor results on modern inkjet
+                  printers, particularly models that offer multiple
+                  drop sizes, but it can yield very good results on
+                  laser printers.  It is a good choice for printing
+                  text or line art where no grayscale or color is
+                  used, and also works very well when Threshold color
+                  correction is used.
+
+                * FAST: This algorithm also produces output with very
+                  strong diagonal patterns, and is also quite fast.
+                  It produces somewhat better results on modern inkjet
+                  printers that offer multiple drop sizes, but offers
+                  no advantages on laser printers or old (generally
+                  pre-1999) inkjet printers.
+
+                * ORDERED: This algorithm produces much smoother
+                  output than Fast or Very Fast.  It is somewhat
+                  slower than those algorithms.  It utilizes a fixed
+                  pattern that is generally free of artifacts, but it
+                  has some noise (roughness of texture) that may be
+                  objectionable with smooth-toned images.  It is an
+                  excellent choice for printing draft copies of
+                  business graphics or photographs (charts, etc.) due
+                  to its lack of artifacts.
+
+                * ADAPTIVE HYBRID: This algorithm produces slightly
+                  smoother output than Ordered dithering, at some cost
+                  in performance.  It uses a fixed pattern in
+                  highlights to avoid artifacts, and error diffusion
+                  at higher densities to reduce noise.  It is an
+                  excellent choice for printing business graphics due
+                  to its lack of artifacts and smooth texture in
+                  darker tones.
+
+                * EVEN TONE: This relatively new algorithm yields
+                  excellent smoothness in all tones (light, midtone,
+                  and shadow), but is considerably slower than most of
+                  the other algorithms.  It is somewhat prone to
+                  artifacts, including "tearing", at sharp boundaries.
+                  This algorithm is well-suited for printing
+                  photographs, but is not as suitable for printing
+                  solid-tone graphics.
+
+                * HYBRID EVEN TONE: This algorithm combines Even Tone
+                  and Ordered dithering to yield smooth results with
+                  fewer artifacts than Even Tone dithering, but is
+                  even slower than standard Even Tone.  It uses the
+                  fixed pattern of Ordered dithering to break up the
+                  artifacts of Even Tone dithering.  The result is not
+                  quite as smooth as pure Even Tone, but the reduction
+                  of artifacts makes this an excellent choice for
+                  photographs or photographs mixed with other
+                  graphics.
+
+                * PREDITHERED: This is used in combination with
+                  dithering performed outside of Gutenprint or with
+                  printers that perform their own dithering.  It
+                  assumes that the output is already dithered and
+                  generates the appropriate drops based only on the
+                  values provided.
+
+        Linear Contrast Adjustment
+
+                The standard contrast control does not adjust the
+                black and white points of the output; black in the
+                input becomes black in the output, for example.  The
+                result is that if contrast is reduced below 1, the
+                contrast in the highlights and shadows is actually
+                increased to keep the same total tonal range.
+
+                Gimp-Print 4.2 used a different kind of contrast
+                control.  In Gimp-Print 4.2, reducing the contrast
+                reduced the contrast throughout the tonal range,
+                resulting in white being printed as a light gray and
+                black as a dark gray (reducing the contrast all the
+                way to zero resulted in a uniform gray).  If contrast
+                was increased, the contrast was stretched until the
+                output reached either black or white; anything lighter
+                always printed as white and anything darker as black.
+
+                Turning this control on selects the old Gimp-Print 4.2
+                behavior.  This control is normally turned off.
+
+
+----------------
+
+G) OUTPUT DENSITY (INK QUANTITY) CONTROLS
+
+    These controls adjust the amount of ink printed on the page.
+    These controls may be used to darken a solid, pure black, or
+    eliminate puddling (wet ink left on the paper that does not dry in
+    the printer) if needed.  They may also be useful for adjusting the
+    behavior of non-standard inks.  They should not be used to lighten
+    or darken the print if the black level is correct.
+
+    These controls are adjustments -- they adjust the amount of ink
+    relative to the amount selected by the driver for the paper and
+    resolution chosen.
+
+        Density Value
+
+                This control adjusts the total amount of ink used in
+                all channels (ink colors).
+
+        Black Density Value
+        Blue Density Value
+        Cyan Density Value
+        Magenta Density Value
+        Yellow Density Value
+        Red Density Value
+
+                These controls adjust the amount of ink used by each
+                channel separately.  They may be used to correct the
+                amount of ink if needed to strengthen or weaken
+                particular colors (e. g. if yellow is too strong or
+                too weak).  They should not be used to correct gray
+                balance (to produce neutral gray) -- the gray balance
+                controls described below should be used for that
+                purpose.
+
+		These options are new to Gutenprint 5.0.
+
+        Ink Limit Value
+
+                This control adjusts the maximum amount of ink that
+                the driver will use to print with.  This may be used
+                if you want to use large amounts of particular inks to
+                achieve saturated dark colors, without using excessive
+                ink overall that will result in ink puddling or
+                spilling within the printer.  This control should be
+                used only by people very experienced in inkjet
+                printing.
+
+		This option is new to Gutenprint 5.0.
+
+
+----------------
+
+H) GRAY BALANCE CONTROLS
+
+    These controls adjust the gray balance by changing the amount of
+    each color of ink used to produce gray.  For example, if gray
+    prints somewhat greenish, it can be corrected by increasing the
+    magenta balance.  These options are new to Gutenprint 5.0.
+
+        Magenta Balance Value
+        Yellow Balance Value
+        Cyan Balance Value
+
+
+----------------
+
+I) OUTPUT GAMMA CONTROLS
+
+    These controls permit adjusting the gamma (exponent) of the
+    transfer curves of the individual channels.  On most printers,
+    using a linear ink scale (that is, the amount of ink is directly
+    proportional to the input value) will produce very dark
+    highlights, as even quite small amounts of ink produce very strong
+    colors or gray.  Therefore, the driver uses less ink to produce
+    lighter colors.  This does not affect the darkest tones.
+
+    Setting these controls to larger values results in lighter
+    highlights and midtones and increase contrast in the dark tones,
+    while lower values result in darker midtones and highlights with
+    reduced dark tone contrast.  These controls are adjustments --
+    they adjust the gamma relative to the gamma chosen by the driver
+    by multiplying them together.  For example, if the driver uses a
+    gamma value of 2.0 for a particular printer, and you specify a
+    gamma of 0.75, the actual gamma used to print will be 1.5.
+
+        Composite Gamma Value
+
+                This control adjusts the gamma of all available ink
+                channels when printing in color.
+
+		This option is equivalent to the Gamma option in
+		Gimp-Print 4.2.
+
+        Black Gamma Value
+
+                This control adjusts the gamma of the black channel
+                when printing in grayscale.
+
+		This option is new to Gutenprint 5.0.
+
+        Cyan Gamma Value
+        Magenta Gamma Value
+        Yellow Gamma Value
+
+                These controls adjust the gamma of individual channels
+                when printing on printers that use cyan, magenta, and
+                yellow inks (all inkjet printers use CMY inks).  These
+                gamma values are multiplied by the composite gamma
+                value and the gamma chosen by the driver.
+
+                Note that the black gamma value is not used when
+                printing in color.  That is because the amount of gray
+                is computed after the gamma transformation has been
+                applied to each channel, and the black channel is
+                synthesized from this value.  The GCR Transition Value
+                serves as a gamma value for the black channel.  In
+                addition, there are no gamma values for the special
+                channels for printers that offer additional inks (such
+                as red and blue) for similar reasons.
+
+		These controls are equivalent to the Cyan, Magenta,
+		and Yellow controls in Gimp-Print 4.2.
+
+        Red Gamma Value
+        Green Gamma Value
+        Blue Gamma Value
+
+                These controls adjust the gamma of individual channels
+                when printing on printers that use red, green, and
+                blue inks (Postscript printers and many dye
+                sublimation printers use red, green, and blue colors).
+                These gamma values are multiplied by the composite
+                gamma value and the gamma chosen by the driver.
+
+		These options are new to Gutenprint 5.0; Gimp-Print
+		4.2 referred to them as Cyan, Magenta, and Yellow even
+		if the output was RGB.
+
+
+----------------
+
+J) GRAY GENERATION CONTROLS
+
+    These controls adjust the conversion of gray into black ink and
+    composite (CMY) components.  When printing in color, light grays
+    are often printed using composite inks rather than black ink to
+    reduce the speckling effect of dark black dots, while dark grays
+    and black are usually printed using black ink to achieve a darker
+    black.  With some ink and paper combinations it is necessary to
+    use a mixture of black and composite components to achieve maximum
+    density and in some cases to achieve neutral grays (some pigment
+    black inks are actually brown).
+
+    The effect of using too much or too little black ink varies.
+    Typically if too much black ink is used light colors and grays
+    will have noticeable speckling from the black drops, while if too
+    little black ink is used the midtones and dark tones will be
+    washed out and in some cases too much ink will be used leading to
+    puddles on the page.  In some cases very large amounts of
+    composite ink cause color shifts (darker grays are not neutral).
+    Epson Premium Glossy Photo Paper seems to be particularly prone to
+    this problem, particularly with dye inks.
+
+    In general, lower-quality papers require more black ink (composite
+    inks generally cannot create very dark tones), while higher
+    quality papers require less black ink (the composite inks can
+    create much darker grays, and the black dots appear much sharper).
+
+    Setting these controls effectively requires a good understanding
+    of gray generation and a fair amount of experimentation.  Normally
+    it's only necessary to set the paper type correctly to get good
+    results.
+
+    These options are all new to Gutenprint 5.0.
+
+        GCR Lower Bound Value
+
+                This control specifies the darkest shade of gray at
+                which no black ink will be used (i. e. any lighter
+                gray component will be printed using only composite
+                inks).  Setting this control to zero means that some
+                amount of black ink will always be used; setting it to
+                1 means that no black ink will ever be used.
+
+        GCR Upper Bound Value
+
+                This control specifies the lightest shade of gray at
+                which no composite CMY ink will be used (i. e. this
+                level of gray and higher will be printed using only
+                black ink).  This control should never be set any
+                lower than the GCR Lower Bound Value.  Setting this
+                control to zero means that only black ink is used to
+                print any gray value; setting this control to a value
+                greater than one means that some composite ink will be
+                used even when printing black.  The upper limit for
+                this control is 5 (in which case black will be printed
+                with no more than 20% black ink).
+
+                If you use an ink set requiring use of color inks to
+                produce neutral grayscale, you should set the GCR
+                Lower Bound Value to zero or a value very close to
+                zero and the GCR Upper Bound Value should be greater
+                than 1, along with a GCR Transition Value (below) of
+                1.  This will ensure that the proportion of black and
+                color inks will be close to constant throughout the
+                gray range.  With this kind of inkset, it's often
+                possible to produce cool or warm toned grayscale
+                prints by selecting Desaturated color correction and
+                adjusting the GCR Upper Bound Value appropriately.
+                For example, if the black ink has a brown (warm) cast,
+                increasing the GCR Upper Bound Value will yield a
+                cooler tone (less black ink) while decreasing it will
+                yield a warmer tone (more black ink).
+
+        GCR Transition Value
+
+                This control specifies the gamma of the GCR transition
+                curve.  Setting this control to a smaller value
+                results in less black ink being used in the lighter
+                portion of the transition region.  This control is
+                useful if the black ink is much darker than the
+                composite inks in order to produce a smoother
+                transition.
+
+        GCR Curve
+
+                This control (only available through the Print plugin
+                for the GIMP or other Gutenprint-based applications
+                that provide curve capability) allows you to specify
+                the conversion curve from gray to black/composite
+                precisely.  The horizontal axis of this curve
+                represents the gray level (between 0, or no gray at
+                all, and 1, or pure black); the vertical axis
+                represents the fraction of gray that is converted to
+                black (0 means only composite inks, and 1 means only
+                black ink).
+
+
+----------------
+
+K) OUTPUT LINEARIZATION CURVES (GIMP Plugin Only)
+
+    These controls permit adjusting the transfer (linearization)
+    curves of each channel precisely.  They are only available through
+    the Print plugin for the GIMP or other Gutenprint-based
+    applications that provide curve capability.  All of these controls
+    are considered to be for very advanced use only.  These options
+    are all new to Gutenprint 5.0.
+
+        Black Curve
+        Blue Curve
+        Cyan Curve
+        Magenta Curve
+        Yellow Curve
+        Red Curve
+        Green Curve
+
+
+----------------
+
+L) DETAILED COLOR CORRECTION CURVES (GIMP Plugin Only)
+
+    These controls permit adjusting precise characteristics of color
+    generation/correction.  They are only available through the Print
+    plugin for the GIMP or other Gutenprint-based applications that
+    provide curve capability.  All of these controls are considered to
+    be for very advanced use only.
+
+    The horizontal axis of all of these curves represents the hue of
+    the output.  Hue is measured as an angle, where 0 and 360 degrees
+    represent cyan (or red, if the output inks are RGB).
+    Conventionally, these angles are represented as a number between 0
+    and 6 (each full number in this scale represents 60 degrees).  The
+    specific hue angles for CMY and RGB outputs are as follows:
+
+             \                  Ink Type
+        Angle \         RGB             CMY
+        -----  \        ---             ---
+           0    |       Red             Cyan
+           1    |       Yellow          Blue
+           2    |       Green           Magenta
+           3    |       Cyan            Red
+           4    |       Blue            Yellow
+           5    |       Magenta         Green             
+           6    |       Red             Cyan
+
+    These options are all new to Gutenprint 5.0.
+
+        Hue Adjustment Curve
+        Luminosity Adjustment Curve
+        Saturation Adjustment Curve
+
+                These controls adjust the color correction in High
+                Accuracy, Bright Colors, and Correct Hue Only color
+                correction modes.  These color correction modes work
+                by adjusting the hue, saturation, and luminosity (HSL)
+                of the output inks to achieve a more accurate color
+                than the color created by simply converting the red,
+                green, and blue inputs to cyan, magenta, and yellow
+                (or red, green, and blue) inks.  Note that in this
+                printing context luminosity represents darkness
+                (amount of light subtracted) rather than brightness.
+
+                The saturation and hue adjustments are first applied.
+                The luminosity correction operates on only the color
+                component of the output.  Before this correction is
+                applied, any gray value is removed, and added back
+                after the correction is completed.
+
+                The vertical axis of the Hue Adjustment Curve
+                represents an angular difference that is added to the
+                base hue value to generate the desired output.  For
+                example, if the blue output is purple (too close to
+                magenta), adding a negative value to that range of the
+                output will bring the blue value more toward cyan
+                (less magenta).
+                
+                The vertical axis of the Saturation Adjustment Curve
+                represents an amount by which the saturation is
+                multiplied.  At any given hue point it may take on any
+                value between 0 (eliminate all color saturation, which
+                is equivalent to converting to pure gray) and 4
+                (dramatically boost the saturation).  Therefore, this
+                adjustment may be used to tone down excessively
+                brilliant colors (e. g. if the reds are overly
+                brilliant) or brighten up dull colors (e. g. if the
+                greens are somewhat dull).  This control has no effect
+                if Correct Hue Only is used.  If the saturation value
+                is greater than 1, the effect differs depending upon
+                whether High Accuracy or Bright Colors mode is
+                selected: if Bright Colors is selected, the saturation
+                is simply multiplied by the desired value and then set
+                to 1 if it would exceed unity.  If High Accuracy mode
+                is selected, the amount of saturation boost is
+                decreased if the starting saturation is high.
+
+                The vertical axis of the Luminosity Adjustment Curve
+                represents an amount by which the luminosity is
+                multiplied.  At any given hue point it may take on any
+                value between 0 (remove the color component
+                altogether) and 1 (leave it as is).  Therefore, the
+                function of the Luminosity Adjustment Curve is to
+                lighten excessively dark colors rather than to darken
+                light colors.  This control has no effect if Correct
+                Hue Only mode is used.
+
+        Blue Map
+        Cyan Map
+        Magenta Map
+        Yellow Map
+        Red Map
+
+                These curves control how the auxiliary red and blue
+                inks are used on the Epson Stylus Photo R800, Stylus
+                Photo R1800, and PictureMate family of printers.
+                These printers use auxiliary inks to achieve more
+                brilliance in the red and blue.  Other printers in the
+                future may use other auxiliary channels, which will be
+                made available in similar fashion.
+
+                The vertical axis of each of these controls specifies
+                the amount of each ink that should be used to print
+                colors of that hue.  These curves are used only to
+                generate color; any gray component is removed prior to
+                the color generation and added back later.  For
+                example, it is possible to specify that a certain
+                shade of purple is printed using .2 red ink, .6
+                magenta ink, and .5 blue ink (hypothetically).
+
+
+----------------
+
+M) SPECIALIZED OUTPUT CONTROLS
+
+    These controls are used to modify the output in very
+    printer-specific ways.  These options are all new to Gutenprint
+    5.0.
+
+        Gloss Level Value
+
+                This control is provided on printers such as the Epson
+                Stylus Photo R800 and R1800 that offer a special gloss
+                enhancer to produce an even degree of gloss on glossy
+                papers regardless of the amount of ink used.  On
+                certain glossy papers, areas with high ink coverage
+                are a lot glossier than areas with little ink coverage
+                (highlights); the gloss enhancer is basically a
+                transparent ink that increases the gloss of these
+                areas.  This control specifies the desired total
+                amount of ink to be printed, including both the normal
+                color and black inks and the gloss enhancer.  If the
+                amount of normal inks is less than this amount, gloss
+                enhancer is used to increase the total amount of ink
+                used.
+
+
+----------------
+
+N) TRANSITION CONTROLS
+
+    These controls adjust the level at which light inks (such as the
+    light cyan and magenta inks used on many "photo printers") are
+    used in place of the dark inks.  The light inks are used to
+    produce a smoother texture (less speckling); the light cyan
+    droplets, for example, are individually much less visible than the
+    normal dark cyan droplets.
+
+    The ink substitution works by replacing a certain amount of ink by
+    a mixture of the light and dark inks.  For example, the dark cyan
+    ink may be about 3 times as dark as the light cyan ink, so in
+    light areas the cyan may be replaced by 3 times as much light
+    cyan.  However, this only works up to a certain point; beyond that
+    point, adding more light ink does not significantly increase the
+    darkness of the ink.  These transition values adjust the limits at
+    which the ink substitution is done; the lower these limits are
+    set, the lighter the output at which dark ink is introduced.
+    Setting these values lower will generally yield more accurate
+    midtone colors at the expense of more speckling in the light
+    midtones and highlights.  Generally these values need to be lower
+    on low-quality paper than on high quality glossy paper.
+
+    These options are all new to Gutenprint 5.0.
+
+        Dark Yellow Transition Value
+        Light Gray Transition Value
+        Mid Gray Transition Value
+        Dark Gray Transition Value
+        Gray Transition Value
+        Light Cyan Transition Value
+        Light Magenta Transition Value
+        Light Yellow Transition Value
+
+
+----------------
+
+O) FOOMATIC-ONLY OPTIONS
+
+    This control is available only when using the Foomatic interface.
+    It provides a collection of presets appropriate for various
+    printing tasks.  It is similar in concept to (and provided the
+    inspiration for) the Print Quality and Image Type options provided
+    in Gutenprint.
+
+        Printout Mode
diff --git a/README b/README
index c52ff69..d1ed836 100644
--- a/README
+++ b/README
@@ -1,7 +1,10 @@
+Welcome to Gutenprint 5.0.0-rc3!  Please read these release notes
+carefully.
+
 INTRODUCTION
 
-    This is Gutenprint version 5.0.0 release candidate 2, the second
-    release candidate of Gutenprint 5.0.  Gutenprint, formerly named
+    This is Gutenprint version 5.0.0 release candidate 3, a release
+    candidate of Gutenprint 5.0.  Gutenprint, formerly named
     Gimp-Print, is a suite of printer drivers that may be used with
     most common UNIX print spooling systems, including CUPS, lpr,
     LPRng, or others.  These drivers provide high quality printing for
@@ -9,22 +12,17 @@ INTRODUCTION
     in many cases equal to or better than proprietary vendor-supplied
     drivers, and can be used for many of the most demanding printing
     tasks.  A complete list of supported printers may be found in the
-    NEWS file.
-
-    The package 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 Print plugin for the GIMP is now only a
-    small (but important) piece 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 also includes a plug-in for the GIMP image editor.
-    This plug-in is also distributed with the GIMP.
-
-    Gutenprint was previously known as Gimp-Print.  The name was
-    changed prior to the 5.0.0 release.
+    NEWS file.  Gutenprint also includes a plug-in for the GIMP image
+    editor.
+
+    Gutenprint, formerly named Gimp-Print, 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 Print
+    plugin for the GIMP is now only a small (but important) piece 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 this README, and the NEWS file carefully!  Many things
     have changed from previous releases.  The package is quite
@@ -146,11 +144,11 @@ CUPS
     a version of Gutenprint with PPD files not built for that precise
     version, the driver will fail with a diagnostic error message.
     For example, PPD files built for Gutenprint 5.0.0-beta4 will not
-    work with driver version 5.0.0-rc2.  You can identify printers
+    work with driver version 5.0.0-rc3.  You can identify printers
     using Gutenprint PPD files by the name of the PPD file, which will
     be something like:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
 
     NOTE for Linux (at least) users: If you are using CUPS 1.1.11 or
     higher, and you have a USB-connected printer, you must have a
@@ -177,24 +175,44 @@ E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/u
     existing .lpoptions file in your home directory and try printing
     again.
 
-    This package normally builds translated versions of the PPD
-    files.  This provides PPD files translated into the languages that
-    this package supports.  However, the translation process does not
-    work correctly on all systems; in particular, many BSD systems are
+    This package normally builds PPD files containing all available
+    options for the printer chosen.  Many of these options
+    (particularly the color adjustments) are not needed in most cases
+    and may confuse people.  It is possible to generate PPD files
+    containing only a minimal set of options and basic paper sizes for
+    each printer.  Distributors may wish to package the two sets of
+    PPD files separately allowing end users to select one or both
+    sets (the two sets of PPD files have different names and can
+    coexist).
+
+    To generate both the simplified and the standard full-featured PPD
+    files, you should run configure as follows:
+
+    ./configure --with-cups --enable-simplified-cups-ppds=yes
+
+    If you wish to generate only the simplified PPD files, you may run
+
+    ./configure --with-cups --enable-simplified-cups-ppds=only
+
+    This package normally builds translated versions of the PPD files.
+    This provides PPD files translated into the languages that this
+    package supports.  However, the translation process does not work
+    correctly on all systems; in particular, many BSD systems are
     known to simply build multiple copies of the English PPD files.
-    If your system does not build these files correctly, which will be
-    apparent when you use a CUPS front end to select a PPD file and
-    you see something like this:
+    In addition, you may not need all of these PPD files installed on
+    your system.  If your system does not build these files correctly,
+    which will be apparent when you use a CUPS front end to select a
+    PPD file and you see something like this:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
 
     rather than this:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(sv)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(fr)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(sv)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(fr)
 
     you may wish to turn off the translation of PPD files:
 
@@ -392,10 +410,11 @@ GHOSTSCRIPT
     no longer provide documentation on direct use of this driver
     without the Foomatic front end.
 
-    Gutenprint 5.0 no longer provides the monolithic "stp" driver
-    present in Gimp-Print 4.2.  This driver, which was compiled and
-    linked directly into Ghostscript, was very difficult to maintain
-    and required a complex integration procedure.
+    Gutenprint 5.0 no longer provides the monolithic (legacy
+    Ghostscript) "stp" driver present in Gimp-Print 4.2.  This driver,
+    which was compiled and linked directly into Ghostscript, was very
+    difficult to maintain and required a complex integration
+    procedure.
 
 
 RECOMMENDED SETTINGS
@@ -514,12 +533,17 @@ PACKAGING
 
       + "calibrate.ppm" belongs in /usr/share/cups.
 
-      The PPD's packaged with gutenprint are rather bulky, about 1 MB
-      for each language installed.  At present, twelve language
-      translations are installed, in addition to the US English
-      defaults: GB English, Swedish, Danish, Norwegian, French,
-      Polish, Slovakian, Greek, Spanish, Dutch, German, and
-      Portuguese.  You may wish to install these selectively.
+      The PPD's packaged with gutenprint consume a lot of space.  At
+      present, a full set of full-featured PPD files consumes about
+      7.5 MB per language (about 750 files); a full set of simplified
+      PPD files consumes about 3 MB additional per language.  At
+      present, sixteen language translations are installed, in
+      addition to the US English defaults: Danish, German, Czech,
+      Greek, Spanish, Hungarian, Japanese, Norwegian, Dutch, Polish,
+      Portuguese, Slovak, GB English, and Chinese (Taiwan).  This
+      totals about 25,000 files, so you may wish to install the
+      translated PPD files separately.  You may additionally wish to
+      separate the simplified and standard PPD files.
 
       Please see KNOWN BUILD ISSUES above for more discussion about
       build issues related to the PPD files.
@@ -550,4 +574,6 @@ PACKAGING
 USE OF THE CVS REPOSITORY
 
     Please read doc/README.maintaining for instructions on how to
-    build from the CVS repository.
+    build from the CVS repository.  You will need additional packages
+    and tools for this purpose.
+
diff --git a/aclocal.m4 b/aclocal.m4
index a88e781..4b1cfc4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,401 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# 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 Debian 1.5.22-2 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1985,18 +1593,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-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='NetBSD ld.elf_so'
-  ;;
-
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -2772,7 +2368,7 @@ linux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3781,7 +3377,7 @@ case $host_os in
 	;;
     esac
     ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -5405,7 +5001,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      netbsd*)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -5757,12 +5353,6 @@ ifelse([$1],[CXX],[
   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'
   ;;
-  kfreebsd*-gnu)
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  linux*)
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-  ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -5959,13 +5549,12 @@ EOF
   $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'
 	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -6295,21 +5884,12 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | 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
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-      
-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-    kfreebsd*-gnu)
-      _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
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-      ;;
 
     hpux9*)
       if test "$GCC" = yes; then
@@ -6406,7 +5986,7 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -7640,3 +7220,395 @@ 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/autogen.sh b/autogen.sh
index 7a88e19..82fef1b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,25 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
+srcdir="`dirname $0`"
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gutenprint"
 
-(test -f $srcdir/configure.ac) || {
+(test -f "$srcdir/configure.ac") || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level directory"
     exit 1
 }
 
+if test $# -gt 0 ; then
+    case "$1" in
+	-h|--help|--help=*)
+	if test -f "$srcdir/configure" ; then
+	    exec "$srcdir/configure" "$1"
+	fi ;;
+	*) ;;
+    esac
+fi
+
 . $srcdir/scripts/autogen.sh
diff --git a/config.h.in b/config.h.in
index 3a828c9..d8572e2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -40,6 +40,9 @@
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
diff --git a/configure b/configure
index e703ef5..4116ac0 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.133 .
+# From configure.ac Revision: 1.139 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc2.
+# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc3.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -441,8 +441,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.0-rc2'
-PACKAGE_STRING='gutenprint 5.0.0-rc2'
+PACKAGE_VERSION='5.0.0-rc3'
+PACKAGE_STRING='gutenprint 5.0.0-rc3'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -483,7 +483,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -992,7 +992,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gutenprint 5.0.0-rc2 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.0-rc3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1058,7 +1058,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.0-rc2:";;
+     short | recursive ) echo "Configuration of gutenprint 5.0.0-rc3:";;
    esac
   cat <<\_ACEOF
 
@@ -1077,6 +1077,9 @@ Optional Features:
   --enable-cups-ppds      build CUPS PPD files [(automatic)]
   --enable-translated-cups-ppds
                           build translated CUPS PPD files [yes]
+  --enable-simplified-cups-ppds
+                          build simplified CUPS PPD files (options: yes, no,
+                          only) [no]
   --enable-cups-ppds-at-top-level
                           place CUPS PPD files at top level [no]
   --enable-cups-level3-ppds
@@ -1248,14 +1251,14 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.0-rc2
+gutenprint configure 5.0.0-rc3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1286,7 +1289,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gutenprint $as_me 5.0.0-rc2, which was
+It was created by gutenprint $as_me 5.0.0-rc3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1656,11 +1659,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=0
 GUTENPRINT_MICRO_VERSION=0
-GUTENPRINT_EXTRA_VERSION=-rc2
+GUTENPRINT_EXTRA_VERSION=-rc3
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.0-rc2
+GUTENPRINT_VERSION=5.0.0-rc3
 GUTENPRINTUI_CURRENT_INTERFACE=1
 GUTENPRINTUI_INTERFACE_AGE=0
 GUTENPRINTUI_BINARY_AGE=0
@@ -1977,7 +1980,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.0.0-rc2'
+ VERSION='5.0.0-rc3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2206,7 +2209,7 @@ GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
           ac_config_headers="$ac_config_headers config.h"
 
 
-ALL_LINGUAS="cs da de el en_GB es fr ja nb nl pl pt sk sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fr hu ja nb nl pl pt sk sv zh_TW"
 
 
 
@@ -2908,7 +2911,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2966,7 +2970,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3082,7 +3087,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3136,7 +3142,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3181,7 +3188,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3225,7 +3233,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3641,7 +3650,7 @@ linux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -3758,7 +3767,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3761 "configure"' > conftest.$ac_ext
+  echo '#line 3770 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3878,7 +3887,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4207,7 +4217,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4377,7 +4388,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4444,7 +4456,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4704,7 +4717,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4762,7 +4776,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4833,7 +4848,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4877,7 +4893,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5240,7 +5257,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5243:" \
+echo "$as_me:5260:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5286,7 +5303,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5335,7 +5353,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6301,11 +6320,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:6304: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6323: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6308: \$? = $ac_status" >&5
+   echo "$as_me:6327: \$? = $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.
@@ -6569,11 +6588,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:6572: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6591: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6576: \$? = $ac_status" >&5
+   echo "$as_me:6595: \$? = $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.
@@ -6673,11 +6692,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:6676: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6695: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6680: \$? = $ac_status" >&5
+   echo "$as_me:6699: \$? = $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
@@ -6928,13 +6947,12 @@ EOF
   $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'
 	fi
-	link_all_deplibs=no
       else
 	ld_shlibs=no
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -7150,7 +7168,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7210,7 +7229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7364,22 +7384,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-    kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      link_all_deplibs=no
-      ;;
-
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -7475,7 +7486,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -8161,18 +8172,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-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='NetBSD ld.elf_so'
-  ;;
-
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -8498,7 +8497,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8601,7 +8601,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8666,7 +8667,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8759,7 +8761,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8824,7 +8827,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8890,7 +8894,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8956,7 +8961,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9031,7 +9037,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9034 "configure"
+#line 9040 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9131,7 +9137,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9134 "configure"
+#line 9140 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10214,7 +10220,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10275,7 +10282,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10707,7 +10715,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -11360,7 +11368,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      netbsd*)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -11469,11 +11477,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:11472: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11480: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11476: \$? = $ac_status" >&5
+   echo "$as_me:11484: \$? = $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.
@@ -11573,11 +11581,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:11576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11584: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11580: \$? = $ac_status" >&5
+   echo "$as_me:11588: \$? = $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
@@ -11645,12 +11653,6 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   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'
   ;;
-  kfreebsd*-gnu)
-    link_all_deplibs_CXX=no
-  ;;
-  linux*)
-    link_all_deplibs_CXX=no
-  ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -12126,18 +12128,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-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='NetBSD ld.elf_so'
-  ;;
-
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -13161,11 +13151,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:13164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13154: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13168: \$? = $ac_status" >&5
+   echo "$as_me:13158: \$? = $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.
@@ -13265,11 +13255,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:13268: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13258: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13272: \$? = $ac_status" >&5
+   echo "$as_me:13262: \$? = $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
@@ -13520,13 +13510,12 @@ EOF
   $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'
 	fi
-	link_all_deplibs_F77=no
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -13732,7 +13721,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13782,7 +13772,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13936,22 +13927,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
       ;;
 
-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-    kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      link_all_deplibs_F77=no
-      ;;
-
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -14047,7 +14029,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -14733,18 +14715,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-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='NetBSD ld.elf_so'
-  ;;
-
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -15488,11 +15458,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:15491: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15461: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15495: \$? = $ac_status" >&5
+   echo "$as_me:15465: \$? = $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.
@@ -15756,11 +15726,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:15759: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15729: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15763: \$? = $ac_status" >&5
+   echo "$as_me:15733: \$? = $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.
@@ -15860,11 +15830,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:15863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15833: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15867: \$? = $ac_status" >&5
+   echo "$as_me:15837: \$? = $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
@@ -16115,13 +16085,12 @@ EOF
   $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'
 	fi
-	link_all_deplibs_GCJ=no
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -16337,7 +16306,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16397,7 +16367,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16551,20 +16522,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-    kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
-      link_all_deplibs_GCJ=no
       ;;
 
     hpux9*)
@@ -16662,7 +16624,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -17348,18 +17310,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-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='NetBSD ld.elf_so'
-  ;;
-
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -18756,6 +18706,37 @@ if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
 fi
 
 
+# create custom command-line --enable option
+echo "$as_me:$LINENO: checking whether to build simplified CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build simplified CUPS PPD files... $ECHO_C" >&6
+# Check whether --enable-simplified-cups-ppds or --disable-simplified-cups-ppds was given.
+if test "${enable_simplified_cups_ppds+set}" = set; then
+  enableval="$enable_simplified_cups_ppds"
+  case "${enableval}" in
+
+    yes) WHICH_PPDS="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6 ;;
+    no) WHICH_PPDS=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6 ;;
+    only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; echo "$as_me:$LINENO: result: only" >&5
+echo "${ECHO_T}only" >&6 ;;
+    *) { { echo "$as_me:$LINENO: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&5
+echo "$as_me: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+	    esac
+else
+  if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS}" ; then
+               BUILD_SIMPLIFIED_CUPS_PPDS="no"
+             fi
+             echo "$as_me:$LINENO: result: ${BUILD_SIMPLIFIED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_SIMPLIFIED_CUPS_PPDS}" >&6 ;
+fi;
+if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS}" ; then
+  BUILD_SIMPLIFIED_CUPS_PPDS="no"
+fi
+
+
 USE_LEVEL3_PS=no
 if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
   cups_version=`${CUPS_CONFIG} --version`
@@ -19566,7 +19547,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20287,7 +20269,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20341,7 +20324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20780,7 +20764,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20838,7 +20823,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20954,7 +20940,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21008,7 +20995,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21053,7 +21041,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21097,7 +21086,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21503,7 +21493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21561,7 +21552,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21677,7 +21669,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21731,7 +21724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21776,7 +21770,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21820,7 +21815,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22033,7 +22029,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22099,7 +22096,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22188,7 +22186,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23636,7 +23635,7 @@ int
 main ()
 {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
   ;
   return 0;
 }
@@ -23650,7 +23649,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23741,7 +23741,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23791,7 +23792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24243,7 +24245,7 @@ int
 main ()
 {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
   ;
   return 0;
 }
@@ -24257,7 +24259,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24297,7 +24300,7 @@ int
 main ()
 {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
   ;
   return 0;
 }
@@ -24311,7 +24314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24532,7 +24536,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24592,7 +24597,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24652,7 +24658,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24711,7 +24718,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24772,7 +24780,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24833,7 +24842,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24906,7 +24916,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24984,7 +24995,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25062,7 +25074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25140,7 +25153,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25225,7 +25239,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25315,7 +25330,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25383,7 +25399,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25451,7 +25468,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25520,7 +25538,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25588,7 +25607,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25710,7 +25730,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25780,7 +25801,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25843,7 +25865,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25996,7 +26019,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26073,7 +26097,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26145,7 +26170,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26454,7 +26480,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26773,7 +26800,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27087,7 +27115,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27422,7 +27451,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27536,7 +27566,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27702,7 +27733,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27847,7 +27879,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28004,7 +28037,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28153,7 +28187,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28302,7 +28337,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28451,7 +28487,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28600,7 +28637,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28751,7 +28789,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28901,7 +28940,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29050,7 +29090,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29199,7 +29240,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29390,7 +29432,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29450,7 +29493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29523,7 +29567,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29588,7 +29633,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29660,7 +29706,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29761,7 +29808,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29793,9 +29841,13 @@ _ACEOF
 fi
 done
 
-echo "$as_me:$LINENO: checking for getopt_long" >&5
-echo $ECHO_N "checking for getopt_long... $ECHO_C" >&6
-if test "${ac_cv_func_getopt_long+set}" = set; then
+
+for ac_func in getopt_long
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -29804,12 +29856,12 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define getopt_long to an innocuous variant, in case <limits.h> declares getopt_long.
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getopt_long innocuous_getopt_long
+#define $ac_func innocuous_$ac_func
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getopt_long (); below.
+    which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -29819,7 +29871,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # include <assert.h>
 #endif
 
-#undef getopt_long
+#undef $ac_func
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -29828,14 +29880,14 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char getopt_long ();
+char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getopt_long) || defined (__stub___getopt_long)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-char (*f) () = getopt_long;
+char (*f) () = $ac_func;
 #endif
 #ifdef __cplusplus
 }
@@ -29844,7 +29896,7 @@ char (*f) () = getopt_long;
 int
 main ()
 {
-return f != getopt_long;
+return f != $ac_func;
   ;
   return 0;
 }
@@ -29858,7 +29910,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   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'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29870,18 +29923,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_func_getopt_long=yes
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_getopt_long=no
+eval "$as_ac_var=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
-echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
 
 
 
@@ -30277,7 +30337,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="22 Jan 2006"
+RELEASE_DATE="14 May 2006"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -30337,6 +30397,7 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
 
+
           ac_config_files="$ac_config_files Makefile"
 
           ac_config_files="$ac_config_files doc/Makefile"
@@ -30347,6 +30408,8 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
           ac_config_files="$ac_config_files doc/developer/Makefile"
 
+          ac_config_files="$ac_config_files doc/users_guide/Makefile"
+
           ac_config_files="$ac_config_files include/Makefile"
 
           ac_config_files="$ac_config_files include/gutenprint/Makefile"
@@ -30391,6 +30454,8 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
           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/ghost/Makefile"
 
           ac_config_files="$ac_config_files src/testpattern/Makefile"
@@ -30933,7 +30998,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by gutenprint $as_me 5.0.0-rc2, which was
+This file was extended by gutenprint $as_me 5.0.0-rc3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30996,7 +31061,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.0-rc2
+gutenprint config.status 5.0.0-rc3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -31119,6 +31184,7 @@ do
   "doc/gutenprint.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
   "doc/gutenprintui2.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
   "doc/developer/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
+  "doc/users_guide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/users_guide/Makefile" ;;
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
   "include/gutenprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
   "include/gutenprintui/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
@@ -31141,6 +31207,7 @@ do
   "src/foomatic/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;;
   "src/foomatic/foomatic-generator" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/foomatic-generator" ;;
   "src/foomatic/mk_printerlist" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/mk_printerlist" ;;
+  "src/testpattern/run-testpattern-2" ) CONFIG_FILES="$CONFIG_FILES src/testpattern/run-testpattern-2" ;;
   "src/ghost/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;;
   "src/testpattern/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;;
   "src/gimp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gimp/Makefile" ;;
@@ -31448,6 +31515,7 @@ s,@gutenprintui2_libdeps@,$gutenprintui2_libdeps,;t t
 s,@LIBREADLINE_DEPS@,$LIBREADLINE_DEPS,;t t
 s,@MAINTAINER_CFLAGS@,$MAINTAINER_CFLAGS,;t t
 s,@PLUG_IN_PATH@,$PLUG_IN_PATH,;t t
+s,@WHICH_PPDS@,$WHICH_PPDS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 s,@LTALLOCA@,$LTALLOCA,;t t
@@ -31617,6 +31685,11 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -31655,12 +31728,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@ -31698,6 +31765,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
 		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION} ;;
     src/foomatic/foomatic-generator ) chmod +x src/foomatic/foomatic-generator ;;
     src/foomatic/mk_printerlist ) chmod +x src/foomatic/mk_printerlist ;;
+    src/testpattern/run-testpattern-2 ) chmod +x src/testpattern/run-testpattern-2 ;;
   esac
 done
 _ACEOF
@@ -32157,9 +32225,7 @@ echo "$as_me: executing $ac_dest commands" >&6;}
       esac
     done ;;
     default )
-echo "Finished configuring."
-echo "Type 'make' to build the package"
-echo "then 'make install' to install it."
+echo
  ;;
   esac
 done
@@ -32194,3 +32260,71 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+
+echo
+echo "Build Summary:"
+echo "----- --------"
+echo
+echo "If you have any problems, please report the information below to"
+echo "$PACKAGE_BUGREPORT"
+echo
+echo "  Release: $PACKAGE_STRING generated on $RELEASE_DATE"
+echo
+echo "  Features:"
+echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
+if test "$BUILD_CUPS" != "no" ; then
+    echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
+    echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+    echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
+    echo "            Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
+    echo "        Install CUPS PPD files at top level:    $CUPS_PPDS_AT_TOP_LEVEL"
+    if test "$STATIC_GENPPD" = "no" -a "$enable_shared" = "yes" ; then
+        echo "        Build genppd statically:                $STATIC_GENPPD (please read the release notes!)"
+    else
+        echo "        Build genppd statically:                $STATIC_GENPPD"
+    fi
+fi
+echo "    Build Ghostscript IJS driver:               $BUILD_GHOSTSCRIPT"
+echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
+if test "$BUILD_FOOMATIC" != "no" ; then
+    echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
+fi
+echo "    Build GIMP 1.2 plugin:                      $BUILD_GIMP"
+echo "    Build GIMP 2.0 plugin:                      $BUILD_GIMP2"
+if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != no ; then
+    echo "        Install plugin in home directory:       $USER_INSTALL"
+fi
+echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
+echo "    Build test programs:                        $BUILD_TEST"
+echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
+echo
+echo "Installation summary:"
+echo "    Installation prefix:                        $prefix"
+echo "    Data directory:                             $PACKAGE_DATA_DIR"
+echo "    Library directory:                          $PACKAGE_LIB_DIR"
+echo "    XML data directory:                         $PKGXMLDATADIR"
+echo "    Module directory:                           $PKGMODULEDIR"
+echo "    Install user guide:                         $INSTALL_USER_GUIDE"
+echo "    Install sample images:                      $INSTALL_SAMPLES"
+echo
+echo "Configuration:"
+if test x$ac_compiler_gnu = "xyes"; then
+    echo "    Compiler options:                           $CFLAGS $GNUCFLAGS"
+else
+    echo "    Compiler options:                           $CFLAGS"
+fi
+echo "    Build static libraries:                     $enable_static"
+echo "    Build shared libraries:                     $enable_shared"
+echo "    Maintainer mode:                            $USE_MAINTAINER_MODE"
+echo "    Generate profiling information:             $ENABLE_PROFILE"
+echo "    Generate debugging symbols:                 $ENABLE_DEBUG"
+echo "    Use modules:                                $WITH_MODULES"
+if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
+    echo "    Use readline libraries:                     $USE_READLINE, extra arguments: $EXTRA_LIBREADLINE_DEPS"
+else
+    echo "    Use readline libraries:                     $USE_READLINE"
+fi
+echo
+echo "Finished configuring."
+echo "Type 'make' to build the package"
+echo "then 'make install' to install it."
diff --git a/configure.ac b/configure.ac
index ec1d2ec..bc6eaeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.133 2006/01/13 16:09:14 rleigh Exp $
+dnl $Id: configure.ac,v 1.139 2006/05/12 01:10:19 rlk Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
 pushdef([GUTENPRINT_MINOR_VERSION],     [0])
 pushdef([GUTENPRINT_MICRO_VERSION],     [0])
-pushdef([GUTENPRINT_EXTRA_VERSION],     [-rc2])
+pushdef([GUTENPRINT_EXTRA_VERSION],     [-rc3])
 pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
 pushdef([GUTENPRINT_INTERFACE_AGE],     [0])
 pushdef([GUTENPRINT_BINARY_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.133 $)
+AC_REVISION($Revision: 1.139 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -147,7 +147,7 @@ dnl Specify a configuration file.
 AM_CONFIG_HEADER([config.h])
 
 dnl Available languages (translations)
-ALL_LINGUAS="cs da de el en_GB es fr ja nb nl pl pt sk sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fr hu ja nb nl pl pt sk sv zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
 dnl Set up libtool scripts.
@@ -227,6 +227,19 @@ STP_ARG_ENABLE([translated-cups-ppds],
                [BUILD_TRANSLATED_CUPS_PPDS],
                [yes])
 
+STP_ARG_ENABLE_DETAILED([simplified-cups-ppds],
+			[],
+			[build simplified CUPS PPD files],
+			[(options: yes, no, only)],
+			[BUILD_SIMPLIFIED_CUPS_PPDS],
+			[no],
+			[
+    yes) [WHICH_PPDS]="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; AC_MSG_RESULT([yes]) ;;
+    no) [WHICH_PPDS]=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; AC_MSG_RESULT([no]) ;;
+    only) [WHICH_PPDS]="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; AC_MSG_RESULT([only]) ;;
+    *) AC_MSG_ERROR([${enableval}: not a valid option ('yes', 'no', or 'only')]) ;;
+				   ])
+
 USE_LEVEL3_PS=no
 if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
   cups_version=`${CUPS_CONFIG} --version`
@@ -747,7 +760,7 @@ AC_TYPE_SIGNAL
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS([nanosleep poll usleep])
-AC_CHECK_FUNC([getopt_long])
+AC_CHECK_FUNCS([getopt_long])
 
 
 dnl Define what has to be built
@@ -930,6 +943,7 @@ AC_SUBST(gutenprintui2_libdeps)
 AC_SUBST(LIBREADLINE_DEPS)
 AC_SUBST(MAINTAINER_CFLAGS)
 AC_SUBST(PLUG_IN_PATH)
+AC_SUBST(WHICH_PPDS)
 
 dnl Output files
 
@@ -938,6 +952,7 @@ AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([doc/gutenprint.dox])
 AC_CONFIG_FILES([doc/gutenprintui2.dox])
 AC_CONFIG_FILES([doc/developer/Makefile])
+AC_CONFIG_FILES([doc/users_guide/Makefile])
 AC_CONFIG_FILES([include/Makefile])
 AC_CONFIG_FILES([include/gutenprint/Makefile])
 AC_CONFIG_FILES([include/gutenprintui/Makefile])
@@ -968,6 +983,8 @@ AC_CONFIG_FILES([src/foomatic/foomatic-generator],
                 [chmod +x src/foomatic/foomatic-generator])
 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/ghost/Makefile])
 AC_CONFIG_FILES([src/testpattern/Makefile])
 AC_CONFIG_FILES([src/gimp/Makefile])
@@ -982,11 +999,77 @@ AC_CONFIG_FILES([cups-gutenprint.list])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([scripts/Makefile])
 AC_CONFIG_COMMANDS([default], [
-echo "Finished configuring."
-echo "Type 'make' to build the package"
-echo "then 'make install' to install it."
+echo
 ],
 [GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_RELEASE_VERSION}]
 )
 
 AC_OUTPUT
+
+echo
+echo "Build Summary:"
+echo "----- --------"
+echo
+echo "If you have any problems, please report the information below to"
+echo "$PACKAGE_BUGREPORT"
+echo
+echo "  Release: $PACKAGE_STRING generated on $RELEASE_DATE"
+echo
+echo "  Features:"
+echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
+if test "$BUILD_CUPS" != "no" ; then
+    echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
+    echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+    echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
+    echo "            Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
+    echo "        Install CUPS PPD files at top level:    $CUPS_PPDS_AT_TOP_LEVEL"
+    if test "$STATIC_GENPPD" = "no" -a "$enable_shared" = "yes" ; then
+        echo "        Build genppd statically:                $STATIC_GENPPD (please read the release notes!)"
+    else
+        echo "        Build genppd statically:                $STATIC_GENPPD"
+    fi
+fi
+echo "    Build Ghostscript IJS driver:               $BUILD_GHOSTSCRIPT"
+echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
+if test "$BUILD_FOOMATIC" != "no" ; then
+    echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
+fi
+echo "    Build GIMP 1.2 plugin:                      $BUILD_GIMP"
+echo "    Build GIMP 2.0 plugin:                      $BUILD_GIMP2"
+if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != no ; then
+    echo "        Install plugin in home directory:       $USER_INSTALL"
+fi
+echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
+echo "    Build test programs:                        $BUILD_TEST"
+echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
+echo
+echo "Installation summary:"
+echo "    Installation prefix:                        $prefix"
+echo "    Data directory:                             $PACKAGE_DATA_DIR"
+echo "    Library directory:                          $PACKAGE_LIB_DIR"
+echo "    XML data directory:                         $PKGXMLDATADIR"
+echo "    Module directory:                           $PKGMODULEDIR"
+echo "    Install user guide:                         $INSTALL_USER_GUIDE"
+echo "    Install sample images:                      $INSTALL_SAMPLES"
+echo
+echo "Configuration:"
+if test x$ac_compiler_gnu = "xyes"; then
+    echo "    Compiler options:                           $CFLAGS $GNUCFLAGS"
+else
+    echo "    Compiler options:                           $CFLAGS"
+fi
+echo "    Build static libraries:                     $enable_static"
+echo "    Build shared libraries:                     $enable_shared"
+echo "    Maintainer mode:                            $USE_MAINTAINER_MODE"
+echo "    Generate profiling information:             $ENABLE_PROFILE"
+echo "    Generate debugging symbols:                 $ENABLE_DEBUG"
+echo "    Use modules:                                $WITH_MODULES"
+if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
+    echo "    Use readline libraries:                     $USE_READLINE, extra arguments: $EXTRA_LIBREADLINE_DEPS"
+else
+    echo "    Use readline libraries:                     $USE_READLINE"
+fi
+echo
+echo "Finished configuring."
+echo "Type 'make' to build the package"
+echo "then 'make install' to install it."
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55e716e..1874fd0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.43 2006/01/14 20:03:39 rlk Exp $
+## $Id: Makefile.am,v 1.45 2006/03/21 01:42:58 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 @SET_MAKE@
 
-SUBDIRS = developer
+SUBDIRS = developer users_guide
 
 include $(top_srcdir)/scripts/global.mk
 
@@ -51,19 +51,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
 
 docs: gutenprint-stamp
 	cd developer; $(MAKE)
+	cd users_guide; $(MAKE)
 
 ps: $(MANUAL).ps
 	cd developer; $(MAKE) ps
+	cd users_guide; $(MAKE) ps
 
 pdf: $(MANUAL).pdf
 	cd developer; $(MAKE) pdf
+	cd users_guide; $(MAKE) pdf
 
 html: 
 	cd developer; $(MAKE) html
-
-install-data-local: gutenprint-options
-	$(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-	$(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+	cd users_guide; $(MAKE) html
 
 
 ## Clean
@@ -83,7 +83,6 @@ EXTRA_DIST = \
 	gutenprint \
 	gutenprintui2 \
 	gutenprint-stamp \
-	gutenprintui2-stamp \
-	gutenprint-options
+	gutenprintui2-stamp
 
 .PHONY: html ps pdf docs
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7a73fdd..ff3b448 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -251,6 +254,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -309,7 +313,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = developer
+SUBDIRS = developer users_guide
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 docdir = $(datadir)/doc/$(PACKAGE)
 MAINTAINERCLEANFILES = \
@@ -324,8 +328,7 @@ EXTRA_DIST = \
 	gutenprint \
 	gutenprintui2 \
 	gutenprint-stamp \
-	gutenprintui2-stamp \
-	gutenprint-options
+	gutenprintui2-stamp
 
 all: all-recursive
 
@@ -596,7 +599,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am:
 
 install-exec-am:
 
@@ -628,10 +631,10 @@ uninstall-info: uninstall-info-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 \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	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-local maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
@@ -640,9 +643,6 @@ uninstall-info: uninstall-info-recursive
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
@@ -675,19 +675,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
 
 docs: gutenprint-stamp
 	cd developer; $(MAKE)
+	cd users_guide; $(MAKE)
 
 ps: $(MANUAL).ps
 	cd developer; $(MAKE) ps
+	cd users_guide; $(MAKE) ps
 
 pdf: $(MANUAL).pdf
 	cd developer; $(MAKE) pdf
+	cd users_guide; $(MAKE) pdf
 
 html: 
 	cd developer; $(MAKE) html
-
-install-data-local: gutenprint-options
-	$(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-	$(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+	cd users_guide; $(MAKE) html
 
 maintainer-clean-local:
 	$(RM) -r gutenprint
diff --git a/doc/README.maintaining b/doc/README.maintaining
index 3bfa6ec..14aa51c 100644
--- a/doc/README.maintaining
+++ b/doc/README.maintaining
@@ -49,7 +49,7 @@ something that you would like covering, please let me know!
 
  -- Roger Leigh <rleigh@debian.org>
 
- $Id: README.maintaining,v 1.21 2005/12/29 00:41:23 rleigh Exp $
+ $Id: README.maintaining,v 1.22 2006/05/14 20:02:18 rleigh Exp $
 
 
 1. Setting up the autotools
@@ -171,11 +171,8 @@ The module you wish to check out must be specified as the modulename.
 When prompted for a password for anonymous, simply press the Enter
 key.
 
-        $ cvs -d:pserver:anonymous@cvs.gimp-print.sourceforge.net:/cvsroot/gimp-
-        print login
-        $ cvs -z3
-        -d:pserver:anonymous@cvs.gimp-print.sourceforge.net:/cvsroot/gimp-print
-        co modulename
+        $ cvs -d:pserver:anonymous@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print login 
+        $ cvs -z3 -d:pserver:anonymous@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print co -P print
 
 Developer CVS access via SSH:
 Only project developers can access the CVS tree via this method.  SSH1
@@ -184,10 +181,8 @@ developername with the proper values.  Enter your site password when
 prompted.  See the sourceforge documentation for more details,
 including how to use RSA keys for authentication.
 
-        $ export CVS_RSH=ssh
-        $ cvs -z3
-        -ddevelopername@cvs.gimp-print.sourceforge.net:/cvsroot/gimp-print
-        co modulename
+        $ export CVS_RSH=ssh 
+        $ cvs -z3 -d:ext:developername@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print co -P print
 
 The CVS info documentation has very detailed explanations of
 everything that can be done with CVS.
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index 4a01053..baa47fc 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -241,6 +244,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -496,9 +500,6 @@ uninstall-am: uninstall-info-am uninstall-local
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index ae94158..fef5abf 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
diff --git a/doc/gutenprint-options b/doc/gutenprint-options
deleted file mode 100644
index b40401c..0000000
--- a/doc/gutenprint-options
+++ /dev/null
@@ -1,935 +0,0 @@
-Basic Printer Options
-
-    These options control basic printer functions.
-
-        Printer Model
-
-                Select the printer to use.  It must be supplied in all
-                cases.
-
-        Page Size
-
-                Select the paper (media) size to print to.  Some
-                printers support custom paper sizes, while others only
-                support certain preset sizes.
-
-                Note that this option refers to the actual size of the
-                media, not the printable area.  For example, selecting
-                A4 refers to actual A4 paper, whatever the margins may
-                be.
-
-        Double-Sided Printing
-
-                Otherwise known as "duplex" printing, this is offered
-                for printers capable of printing on both sides of the
-                page.  In addition to single-sided printing, there are
-                two modes of duplex operation: the page may be flipped
-                over its long edge (like a book), or over the short
-                edge (like a note pad; this is sometimes referred to
-                as Tumble).
-
-        Media Type
-
-                Select the kind of paper or other media being printed
-                to.  This enables the printer and driver to be set up
-                appropriately for the kind of paper in use.
-
-                It is important to set the Media Type to the correct
-                value if possible, or if not to a closely related
-                medium.  The printer may need to know what kind of
-                media is in use to determine how to feed the paper
-                correctly; the driver needs to know in order to select
-                the right output settings.
-
-        Media Source
-
-                Select the source of the paper or other media.  This
-                option is offered with printers that have multiple
-                feeds, for example multiple paper bins, manual feed,
-                printing directly to a CD, etc.
-
-        Ink Set
-
-                Select the kind of ink in use in the printer, for
-                printers offering different optional inks (for
-                example, ink designed for matte paper vs. ink designed
-                for glossy paper).
-
-        Borderless
-
-                Select whether to print with borders or not, for
-                printers with the capability to overprint the page.
-                This is otherwise known as "full bleed".
-
-        Enhanced Gloss
-
-                Some newer printers have a cartridge of "gloss
-                enhancer", which helps solve the problem of pigment
-                inks having an inconsistent "luster" on glossy paper.
-                Use this option to enable use of the gloss enhancer.
-
-
-Advanced Printer Options
-
-    These options control more advanced printer-specific behaviors.
-    Generally it's not necessary to adjust these options.
-
-        Resolution
-
-                Select the resolution to print at (dots per inch).  In
-                general, higher resolutions produce better quality, at
-                the expense of additional time.
-
-                As a general rule of thumb, on laser printers and
-                older inkjet printers resolutions of 300 DPI or
-                thereabouts provide draft quality; lower resolutions
-                provide economy draft quality and cannot produce solid
-                black.  Resolutions of 600 or 720 DPI produce good
-                quality output; higher resolutions are useful for very
-                high quality image or graphic output.  Newer inkjet
-                printers, with smaller ink drop sizes, typically
-                require higher resolutions to produce acceptable
-                output; in some cases even 1440x720 DPI does not
-                produce good quality.
-
-                Users of Epson inkjet printers have another setting
-                available: the Quality option can be used to
-                indirectly control the printer resolution, among other
-                things.  This offers a simpler way to control output
-                quality.
-
-        Ink Type
-
-                Select which subset of inks to use for printing.  For
-                example, on a photo printer with additional light cyan
-                and light magenta inks, it's possible to print with
-                only the standard cyan, magenta, yellow, and black
-                inks.
-
-                Normally there is no reason to use any setting other
-                than the default.  Reasons why one might want to use
-                it include:
-
-                1) Some black inks are not compatible with certain
-                   glossy papers.  If the black ink smudges on your
-                   paper, you may elect to use an option without black
-                   ink (a "composite" setting).
-
-                2) Some inks or paper/ink combinations produce color
-                   shifts when the light inks are used.  If your
-                   chosen combination produces unacceptable color
-                   shifts or color casts, you may prefer to use the
-                   Four Color Standard option, which will generally
-                   yield more consistent color at the expense of
-                   "grainier" output.
-
-        Printing Direction
-
-                Most inkjet printers can print either unidirectionally
-                (the head prints only when moving in one direction) or
-                bidirectionally (the head prints when moving in both
-                directions).  Bidirectional printing is generally
-                faster, since the printer is printing at all times
-                rather than wasting much of the time returning the
-                head to the starting position.  On many printers,
-                however, unidirectional printing produces better
-                quality output than bidirectional printing.
-
-                The standard setting for this option adapts to the
-                printing resolution.
-
-        Laminate Pattern
-
-                Some dye sublimation printers are able achieve better
-                durability of output by covering it with transparent
-                laminate surface. This surface can be of different
-                patterns: common are matte, glossy or texture.
-
-
-Specialized Printer Options
-
-    These options control unusual printer features.  They may be
-    useful in certain circumstances.
-
-        CD Hub Size
-
-                This setting may be used on printers with the
-                capability to print directly to a CD.  Depending upon
-                your choice of media, you may be able to safely print
-                all the way to the inner hole of the CD, or you may
-                not be able to print any closer than the hub about an
-                inch from the center.
-
-        CD Horizontal Fine Adjustment
-        CD Vertical Fine Adjustment
-
-                These settings allow you to shift the position of the
-                print while printing to a CD.  If you find that your
-                print is not centered on the CD surface, you may need
-                to adjust these setting to compensate.
-
-        Interleave Method
-
-                Most inkjet printers create the printed image using
-                multiple overlapping passes of the print head.  On
-                many printers this function is performed within the
-                printer itself and cannot be adjusted, but with many
-                Epson inkjet printers (and some others), this is
-                performed by the driver or may be specified to the
-                printer.  One advantage of the multiple overlapping
-                passes is that it can hide small differences between
-                the individual print head nozzles, which would
-                otherwise be visible as banding.  The different
-                interleave methods are different strategies for
-                for performing this overlapping; some are better at
-                hiding the banding than others.  They all require the
-                same amount of time to print.
-
-                Generally it is not necessary to adjust this; in some
-                cases, depending upon your printer, you may find that
-                one pattern or another performs better.
-
-                On Epson Stylus Pro printers, this option allows
-                specifying different overlap patterns within the
-                printer.  In this case, the choice of overlap pattern
-                may affect both the printing time and the quality to a
-                significant degree.
-
-        Adjust dot size as necessary
-
-                This option is provided on many Epson inkjet printers
-                to allow you to use larger ink drops than those
-                normally used for the resolution chosen.  This may be
-                necessary if you use certain kinds of media or for
-                some reason wish to use much more ink (higher density)
-                than the default.  It should not be necessary to use
-                this option.
-
-
-Basic Output Controls
-
-        Output Type
-
-                This option specifies whether to print in color or
-                black and white/grayscale (using only black inks).
-                Black and white printing is generally faster than
-                color printing, even if the item being printed is
-                entirely black and white.  However, printing with only
-                black ink may yield a "grainy" appearance.
-
-        Color Correction
-
-                This selects the choice of color correction method
-                within Gutenprint.  The following options are offered:
-
-                * DEFAULT: Select a color correction mode appropriate
-                  for the document type being printed.
-
-                * HIGH ACCURACY: Apply optimum color correction to the
-                  output to produce the best color quality.  This
-                  corrects the hue, brightness, and saturation
-                  (brilliance of color).  This is the normal setting
-                  to use for printing photographs or graphics if you
-                  are not using any external color management.
-
-                * BRIGHT COLORS: Apply color correction to the output,
-                  but generate more brilliant colors in some cases.
-
-                * CORRECT HUE ONLY: Apply color correction to the
-                  output, but correct only the hue.  This option does
-                  not correct brightness and saturation.
-
-                * UNCORRECTED: Do not apply any color correction to
-                  the output beyond generating linear output.  This is
-                  the best setting to use when utilizing external
-                  color management; the high accuracy modes employ
-                  correction algorithms that may not work well with
-                  color management.
-
-                  Note that if you use color management you should use
-                  profiles created with Gutenprint and with the exact
-                  settings that you plan to print with.  Profiles
-                  provided by the printer vendor are calibrated for
-                  the vendor's driver, which may not be identical to
-                  Gutenprint's calibration.
-
-                * DESATURATED: Print in pure grayscale, but using
-                  color inks.  The result is somewhat different from
-                  printing in black and white using the Output Type
-                  option -- the driver may use color ink, which
-                  generates smoother output and may yield better
-                  results on many papers.
-
-                * THRESHOLD: Convert all colors to fully on or fully
-                  off, eliminating all gradual tonal gradations.  The
-                  result is that the output will consist of all very
-                  pure colors.
-
-                * DENSITY: Correct only the amount of ink ("density"),
-                  otherwise performing no correction at all, even for
-                  linearity.  Prints made with this option will
-                  usually be very dark if no other color management is
-                  used.  This may be useful if you are printing in 16
-                  bit precision or are using your own linearization
-                  curves.
-
-                * RAW: Perform no correction at all, even for
-                  density.  Prints made with this option will be very
-                  dark and may bleed (or even puddle!) ink if not used
-                  with external color management and linearization.
-                  This option may be useful if you are using external
-                  color management and linearization to get extremely
-                  saturated dark colors by using more ink in
-                  individual channels.  It should be used with extreme
-                  caution, as it is very easy to damage the printer if
-                  you are not careful.
-
-                * PRE-DITHERED: Interpret each pixel as the actual
-                  size of each drop to be printed.  Legal values of
-                  the drop sizes differ between printers; all printers
-                  support 0 (no droplet) and 1 (the largest droplet).
-                  Some printers support four levels (0, 1, 2, and 3).
-
-        Image Type
-
-                Specify the option that best describes your print job.
-                Your choice here will affect the processing of the
-                print job.  Currently available settings are:
-
-                * TEXT: Optimize the output for printing black text
-                  with no graphics.  This option results in crisp
-                  output and is very fast, but will yield very poor
-                  results with any color or grayscale graphics.
-
-                * GRAPHICS: Optimize the output for printing color
-                  graphics.  This option will generate smooth, bright
-                  output.
-
-                * MIXED TEXT AND GRAPHICS: Optimize the output for
-                  printing a mixture of text and graphics.
-
-                * PHOTOGRAPH: Optimize the output for printing
-                  photographs.  This option will generate smooth
-                  tones and high quality colors, but will be slower
-                  than the other options.
-
-                * LINE ART: Optimize the output for printing black and
-                  white line art with intricate detail.
-
-                * MANUAL CONTROL: Do not bias the output at all; use
-                  only the settings specified by the user.
-
-        Print Quality
-
-                Specify the desired output quality using convenient
-                presets.  Where this option is available, Gutenprint
-                will automatically adjust the printing resolution and
-                other options to generate the desired quality.
-                Settings chosen with this option may be overridden by
-                explicitly setting other settings, such as resolution.
-                Not all printers offer all of these options.
-                Currently available settings, in increasing order of
-                quality, include:
-
-                * FAST ECONOMY: Use the fastest printing mode
-                  available on the printer to print with a minimum
-                  amount of ink.  This option will produce very washed
-                  out colors and grays, and will typically be
-                  extremely grainy and streaky.
-
-                * ECONOMY: Print very rapidly with a reduced amount of
-                  ink.  This option will produce washed out colors and
-                  grays and will typically be quite grainy and
-                  streaky.
-
-                * DRAFT: Print low quality draft output quickly.  This
-                  option will typically produce acceptable colors with
-                  some amount of grain on plain paper, but will
-                  typically produce washed out and grainy output on
-                  high quality papers.  On some printers this may
-                  employ a special draft mode to print especially
-                  quickly at the expense of color fidelity.
-
-                * STANDARD: Print at a normal quality level for text
-                  or text/graphics on plain paper or basic inkjet
-                  paper.  This option will typically produce
-                  acceptable colors, but on high quality papers the
-                  output may be grainy or somewhat washed out.  This
-                  option may also be useful for printing draft copies
-                  of photographs on coated inkjet paper.
-
-                * HIGH: Print final copies of text or text/graphics on
-                  plain paper or inkjet paper.  This option will
-                  typically produce good color quality, but the
-                  quality may not be optimal for photographs on glossy
-                  paper.  This option may also be useful for printing
-                  draft copies of photographs on glossy paper.
-
-                * PHOTO: Print photographs on glossy paper or very
-                  high quality text, text/graphics, or line art on
-                  high quality paper.  In the latter application this
-                  will produce output close to laser printer quality.
-                  On the highest quality premium papers the result may
-                  still be a bit grainy.
-
-                * SUPER PHOTO: Print photographs on glossy paper with
-                  very high quality.  This will generally yield very
-                  good results on high quality premium paper but may
-                  be overkill on other papers.  This option is only
-                  offered on printers capable of producing very high
-                  quality output rivaling traditional photographic
-                  printing.  This option may also be appropriate for
-                  very intricate line art, where the required
-                  resolution may exceed the capabilities of laser
-                  printers.
-
-                * ULTRA PHOTO: Print photographs on premium papers
-                  with extremely high quality.  This option is only
-                  offered on printers capable of producing extremely
-                  high quality output matching or exceeding
-                  traditional photographic printing.
-
-                * BEST: Print with the best quality available on the
-                  printer for the application chosen.  This may be
-                  equivalent to one of the other settings; on a very
-                  few printers the resolution may exceed that of Ultra
-                  Photo mode.
-
-                * MANUAL CONTROL: Do not adjust the settings at all;
-                  use only the settings specified by the user.
-
-
-Basic Output Adjustments
-
-        Saturation
-
-                This option controls the vividness of the output
-                color; higher values produce more vivid colors.  Very
-                low values produce muted colors; setting this to zero
-                produces gray.
-
-        Contrast
-
-                This controls the contrast of the output.  Lower
-                values produce less tonal range in the midtones
-                (lighter colors become darker, and darker colors
-                become lighter), which may allow for more definition
-                in the highlights and shadows.  Higher values do the
-                opposite: lighter colors become even lighter, while
-                darker colors become even darker.
-
-        Brightness
-
-                This control adjusts the general brightness of the
-                print; higher values produce generally lighter output,
-                while lower values produce generally darker output.
-                White and black are not changed; colors also retain
-                their hue and saturation.
-
-
-Advanced Output Adjustments
-
-    These controls adjust more specialized settings.
-
-        Dither Algorithm
-
-                Since inkjet printers have a very limited set of ink
-                colours, most colours have to be produced by mixing
-                the available inks.  This is done by printing patterns
-                of very small dots, fooling the eye into seeing many
-                different shades.  This process is called "dithering";
-                several different patterns are available, with
-                trade-offs between speed and quality.  The following
-                dither algorithms are currently available.  If no
-                algorithm is selected, the package chooses an
-                appropriate one based on other option settings.  The
-                following algorithms are currently available,
-                generally in increasing order of quality.
-
-                * VERY FAST: This algorithm produces very rough,
-                  patterned output, but is extremely fast.  This
-                  generally yields poor results on modern inkjet
-                  printers, particularly models that offer multiple
-                  drop sizes, but it can yield very good results on
-                  laser printers.  It is a good choice for printing
-                  text or line art where no grayscale or color is
-                  used, and also works very well when Threshold color
-                  correction is used.
-
-                * FAST: This algorithm also produces output with very
-                  strong diagonal patterns.  It is also quite fast.
-                  It produces somewhat better results on modern inkjet
-                  printers that offer multiple drop sizes, but offers
-                  no advantages on laser printers or old (generally
-                  pre-1999) inkjet printers.
-
-                * ORDERED: This algorithm produces much smoother
-                  output than Fast or Very Fast.  It is somewhat
-                  slower than those algorithms.  It utilizes a fixed
-                  pattern that is generally free of artifacts.  It is
-                  an excellent choice for printing draft copies of
-                  business graphics or photographs (charts, etc.) due
-                  to its lack of artifacts.
-
-                * ADAPTIVE HYBRID: This algorithm produces slightly
-                  smoother output than Ordered dithering, at some cost
-                  in performance.  It uses a fixed pattern in
-                  highlights to avoid artifacts, and error diffusion
-                  at higher densities to reduce noise (which looks
-                  like roughness in texture).  It is an excellent
-                  choice for printing business graphics due to its
-                  lack of artifacts and smooth texture in darker
-                  tones.
-
-                * EVEN TONE: This relatively new algorithm yields
-                  excellent smoothness in all tones (light, midtone,
-                  and shadow), but is considerably slower than most of
-                  the other algorithms.  It is somewhat prone to
-                  artifacts, including "tearing", at sharp boundaries.
-                  This algorithm is well-suited for printing
-                  photographs, but is not as suitable for printing
-                  solid-tone graphics.
-
-                * HYBRID EVEN TONE: This algorithm combines Even Tone
-                  and Ordered dithering to yield smooth results with
-                  fewer artifacts than Even Tone dithering, but is
-                  even slower than standard Even Tone.  It uses the
-                  fixed pattern of Ordered dithering to break up the
-                  artifacts of Even Tone dithering.  The result is not
-                  quite as smooth as pure Even Tone, but the reduction
-                  of artifacts makes this an excellent choice for
-                  photographs or photographs mixed with other
-                  graphics.
-
-                * PREDITHERED: This is used in combination with
-                  dithering performed outside of Gutenprint or with
-                  printers that perform their own dithering.  It
-                  assumes that the output is already dithered and
-                  generates the appropriate drops based only on the
-                  values provided.
-
-        Linear Contrast Adjustment
-
-                The standard contrast control does not adjust the
-                black and white points of the output; black in the
-                input becomes black in the output, for example.  The
-                result is that if contrast is reduced below 1, the
-                contrast in the highlights and shadows is actually
-                increased to keep the same total tonal range.
-
-                Gimp-Print 4.2 used a different kind of contrast
-                control.  In Gimp-Print 4.2, reducing the contrast
-                reduced the contrast throughout the tonal range,
-                resulting in white being printed as a light gray and
-                black as a dark gray (reducing the contrast all the
-                way to zero resulted in a uniform gray).  If contrast
-                was increased, the contrast was stretched until the
-                output reached either black or white; anything lighter
-                always printed as white and anything darker as black.
-
-                Turning this control on selects the old Gimp-Print 4.2
-                behavior.  This control is normally turned off.
-
-
-Output Density Controls
-
-    These controls adjust the amount of ink printed on the page.
-    These controls may be used to darken a solid, pure black, or
-    eliminate puddling (wet ink left on the paper that does not dry in
-    the printer) if needed.  They may also be useful for adjusting the
-    behavior of non-standard inks.  They should not be used to lighten
-    or darken the print if the black level is correct.
-
-    These controls are adjustments -- they adjust the amount of ink
-    relative to the amount selected by the driver for the paper and
-    resolution chosen.
-
-        Density Value
-
-                This control adjusts the total amount of ink used in
-                all channels (ink colors).
-
-        Black Density Value
-        Blue Density Value
-        Cyan Density Value
-        Magenta Density Value
-        Yellow Density Value
-        Red Density Value
-
-                These controls adjust the amount of ink used by each
-                channel separately.  They may be used to correct the
-                amount of ink if needed to strengthen or weaken
-                particular colors (e. g. if yellow is too strong or
-                too weak).  They should not be used to correct gray
-                balance (to produce neutral gray) -- the gray balance
-                controls described below should be used for that
-                purpose.
-
-        Ink Limit Value
-
-                This control adjusts the maximum amount of ink that
-                the driver will use to print with.  This may be used
-                if you want to use large amounts of particular inks to
-                achieve saturated dark colors, without using excessive
-                ink overall that will result in ink puddling or
-                spilling within the printer.  This control should be
-                used only by people very experienced in inkjet
-                printing.
-
-
-Gray Balance Controls
-
-    These controls adjust the gray balance by changing the amount of
-    each color of ink used to produce gray.  For example, if gray
-    prints somewhat greenish, it can be corrected by increasing the
-    magenta balance.
-
-        Magenta Balance Value
-        Yellow Balance Value
-        Cyan Balance Value
-
-
-Output Gamma Controls
-
-    These controls permit adjusting the gamma (exponent) of the
-    transfer curves of the individual channels.  On most printers,
-    using a linear ink scale (that is, the amount of ink is directly
-    proportional to the input value) will produce very dark
-    highlights, as even quite small amounts of ink produce very strong
-    colors or gray.  Therefore, the driver uses less ink to produce
-    lighter colors.  This does not affect the darkest tones.
-
-    Setting these controls to larger values results in lighter
-    highlights and midtones.  These controls are adjustments -- they
-    adjust the gamma relative to the gamma chosen by the driver by
-    multiplying them together.  For example, if the driver uses a
-    gamma value of 2.0 for a particular printer, and you specify a
-    gamma of 0.75, the actual gamma used to print will be 1.5.
-
-        Composite Gamma Value
-
-                This control adjusts the gamma of all available ink
-                channels when printing in color.
-
-        Black Gamma Value
-
-                This control adjusts the gamma of the black channel
-                when printing in grayscale.
-
-        Magenta Gamma Value
-        Yellow Gamma Value
-        Cyan Gamma Value
-
-                These controls adjust the gamma of individual channels
-                when printing on printers that use cyan, magenta, and
-                yellow inks (all inkjet printers use CMY inks).  These
-                gamma values are multiplied by the composite gamma
-                value and the gamma chosen by the driver.
-
-                Note that the black gamma value is not used when
-                printing in color.  That is because the amount of gray
-                is computed after the gamma transformation has been
-                applied to each channel, and the black channel is
-                synthesized from this value.  The GCR Transition Value
-                serves as a gamma value for the black channel.  In
-                addition, there are no gamma values for the special
-                channels for printers that offer additional inks (such
-                as red and blue) for similar reasons.
-
-        Red Gamma Value
-        Green Gamma Value
-        Blue Gamma Value
-
-                These controls adjust the gamma of individual channels
-                when printing on printers that use red, green, and
-                blue inks (Postscript printers and many dye
-                sublimation printers use red, green, and blue colors).
-                These gamma values are multiplied by the composite
-                gamma value and the gamma chosen by the driver.
-
-
-Gray Generation Controls
-
-    These controls adjust the conversion of gray into black ink and
-    composite (CMY) components.  When printing in color, light grays
-    are often printed using composite inks rather than black ink to
-    reduce the speckling effect of dark black dots, while dark grays
-    and black are usually printed using black ink to achieve a darker
-    black.  With some ink and paper combinations it is necessary to
-    use a mixture of black and composite components to achieve maximum
-    density and in some cases to achieve neutral grays (some pigment
-    black inks are actually brown).
-
-    The effect of using too much or too little black ink varies.
-    Typically if too much black ink is used light colors and grays
-    will have noticeable speckling from the black drops, while if too
-    little black ink is used the midtones and dark tones will be
-    washed out and in some cases too much ink will be used leading to
-    puddles on the page.  In some cases very large amounts of
-    composite ink cause color shifts (darker grays are not neutral).
-    Epson Premium Glossy Photo Paper seems to be particularly prone to
-    this problem, particularly with dye inks.
-
-    In general, lower-quality papers require more black ink (composite
-    inks generally cannot create very dark tones), while higher
-    quality papers require less black ink (the composite inks can
-    create much darker grays, and the black dots appear much sharper).
-
-    Setting these controls effectively requires a good understanding
-    of gray generation and a fair amount of experimentation.  Normally
-    it's only necessary to set the paper type correctly to get good
-    results.
-
-        GCR Lower Bound Value
-
-                This control specifies the darkest shade of gray at
-                which no black ink will be used (i. e. any lighter
-                gray component will be printed using only composite
-                inks).  Setting this control to zero means that some
-                amount of black ink will always be used; setting it to
-                1 means that no black ink will ever be used.
-
-        GCR Upper Bound Value
-
-                This control specifies the lightest shade of gray at
-                which no composite CMY ink will be used (i. e. this
-                level of gray and higher will be printed using only
-                black ink).  This control should never be set any
-                lower than the GCR Lower Bound Value.  Setting this
-                control to zero means that only black ink is used to
-                print any gray value; setting this control to a value
-                greater than one means that some composite ink will be
-                used even when printing black.  The upper limit for
-                this control is 5 (in which case black will be printed
-                with no more than 20% black ink).
-
-                If you use an ink set requiring use of color inks to
-                produce neutral grayscale, you should set the GCR
-                Lower Bound Value to zero or a value very close to
-                zero and the GCR Upper Bound Value should be greater
-                than 1, along with a GCR Transition Value (below) of
-                1.  This will ensure that the proportion of black and
-                color inks will be close to constant throughout the
-                gray range.  With this kind of inkset, it's often
-                possible to produce cool or warm toned grayscale
-                prints by selecting Desaturated color correction and
-                adjusting the GCR Upper Bound Value appropriately.
-                For example, if the black ink has a brown (warm) cast,
-                increasing the GCR Upper Bound Value will yield a
-                cooler tone (less black ink) while decreasing it will
-                yield a warmer tone (more black ink).
-
-        GCR Transition Value
-
-                This control specifies the gamma of the GCR transition
-                curve.  Setting this control to a smaller value
-                results in less black ink being used in the lighter
-                portion of the transition region.  This control is
-                useful if the black ink is much darker than the
-                composite inks in order to produce a smoother
-                transition.
-
-        GCR Curve
-
-                This control (only available through the Print plugin
-                for the GIMP or other Gutenprint-based applications
-                that provide curve capability) allows you to specify
-                the conversion curve from gray to black/composite
-                precisely.  The horizontal axis of this curve
-                represents the gray level (between 0, or no gray at
-                all, and 1, or pure black); the vertical axis
-                represents the fraction of gray that is converted to
-                black (0 means only composite inks, and 1 means only
-                black ink).
-
-
-Output Linearization Curves
-
-    These controls permit adjusting the transfer (linearization)
-    curves of each channel precisely.  They are only available through
-    the Print plugin for the GIMP or other Gutenprint-based
-    applications that provide curve capability.  All of these controls
-    are considered to be for very advanced use only.
-
-        Black Curve
-        Blue Curve
-        Cyan Curve
-        Magenta Curve
-        Yellow Curve
-        Red Curve
-        Green Curve
-
-
-Detailed Color Correction Curves
-
-    These controls permit adjusting precise characteristics of color
-    generation/correction.  They are only available through the Print
-    plugin for the GIMP or other Gutenprint-based applications that
-    provide curve capability.  All of these controls are considered to
-    be for very advanced use only.
-
-    The horizontal axis of all of these curves represents the hue of
-    the output.  Hue is measured as an angle, where 0 and 360 degrees
-    represent cyan (or red, if the output inks are RGB).
-    Conventionally, these angles are represented as a number between 0
-    and 6 (each full number in this scale represents 60 degrees).  The
-    specific hue angles for CMY and RGB outputs are as follows:
-
-             \                  Ink Type
-        Angle \         RGB             CMY
-        -----  \        ---             ---
-           0    |       Red             Cyan
-           1    |       Yellow          Blue
-           2    |       Green           Magenta
-           3    |       Cyan            Red
-           4    |       Blue            Yellow
-           5    |       Magenta         Green             
-           6    |       Red             Cyan
-
-        Hue Adjustment Curve
-        Luminosity Adjustment Curve
-        Saturation Adjustment Curve
-
-                These controls adjust the color correction in High
-                Accuracy, Bright Colors, and Correct Hue Only color
-                correction modes.  These color correction modes work
-                by adjusting the hue, saturation, and luminosity (HSL)
-                of the output inks to achieve a more accurate color
-                than the color created by simply converting the red,
-                green, and blue inputs to cyan, magenta, and yellow
-                (or red, green, and blue) inks.  Note that in this
-                printing context luminosity represents darkness
-                (amount of light subtracted) rather than brightness.
-
-                The saturation and hue adjustments are first applied.
-                The luminosity correction operates on only the color
-                component of the output.  Before this correction is
-                applied, any gray value is removed, and added back
-                after the correction is completed.
-
-                The vertical axis of the Hue Adjustment Curve
-                represents an angular difference that is added to the
-                base hue value to generate the desired output.  For
-                example, if the blue output is purple (too close to
-                magenta), adding a negative value to that range of the
-                output will bring the blue value more toward cyan
-                (less magenta).
-                
-                The vertical axis of the Saturation Adjustment Curve
-                represents an amount by which the saturation is
-                multiplied.  At any given hue point it may take on any
-                value between 0 (eliminate all color saturation, which
-                is equivalent to converting to pure gray) and 4
-                (dramatically boost the saturation).  Therefore, this
-                adjustment may be used to tone down excessively
-                brilliant colors (e. g. if the reds are overly
-                brilliant) or brighten up dull colors (e. g. if the
-                greens are somewhat dull).  This control has no effect
-                if Correct Hue Only is used.  If the saturation value
-                is greater than 1, the effect differs depending upon
-                whether High Accuracy or Bright Colors mode is
-                selected: if Bright Colors is selected, the saturation
-                is simply multiplied by the desired value and then set
-                to 1 if it would exceed unity.  If High Accuracy mode
-                is selected, the amount of saturation boost is
-                decreased if the starting saturation is high.
-
-                The vertical axis of the Luminosity Adjustment Curve
-                represents an amount by which the luminosity is
-                multiplied.  At any given hue point it may take on any
-                value between 0 (remove the color component
-                altogether) and 1 (leave it as is).  Therefore, the
-                function of the Luminosity Adjustment Curve is to
-                lighten excessively dark colors rather than to darken
-                light colors.  This control has no effect if Correct
-                Hue Only mode is used.
-
-        Blue Map
-        Cyan Map
-        Magenta Map
-        Yellow Map
-        Red Map
-
-                These curves control how the auxiliary red and blue
-                inks are used on the Epson Stylus Photo R800, Stylus
-                Photo R1800, and PictureMate family of printers.
-                These printers use auxiliary inks to achieve more
-                brilliance in the red and blue.  Other printers in the
-                future may use other auxiliary channels, which will be
-                made available in similar fashion.
-
-                The vertical axis of each of these controls specifies
-                the amount of each ink that should be used to print
-                colors of that hue.  These curves are used only to
-                generate color; any gray component is removed prior to
-                the color generation and added back later.  For
-                example, it is possible to specify that a certain
-                shade of purple is printed using .2 red ink, .6
-                magenta ink, and .5 blue ink (hypothetically).
-
-
-Specialized Output Controls
-
-    These controls are used to modify the output in very
-    printer-specific ways.
-
-        Gloss Level Value
-
-                This control is provided on printers such as the Epson
-                Stylus Photo R800 and R1800 that offer a special gloss
-                enhancer to produce an even degree of gloss on glossy
-                papers regardless of the amount of ink used.  On
-                certain glossy papers, areas with high ink coverage
-                are a lot glossier than areas with little ink coverage
-                (highlights); the gloss enhancer is basically a
-                transparent ink that increases the gloss of these
-                areas.  This control specifies the desired total
-                amount of ink to be printed, including both the normal
-                color and black inks and the gloss enhancer.  If the
-                amount of normal inks is less than this amount, gloss
-                enhancer is used to increase the total amount of ink
-                used.
-
-
-Transition Controls
-
-    These controls adjust the level at which light inks (such as the
-    light cyan and magenta inks used on many "photo printers") are
-    used in place of the dark inks.  The light inks are used to
-    produce a smoother texture (less speckling); the light cyan
-    droplets, for example, are individually much less visible than the
-    normal dark cyan droplets.
-
-    The ink substitution works by replacing a certain amount of ink by
-    a mixture of the light and dark inks.  For example, the dark cyan
-    ink may be about 3 times as dark as the light cyan ink, so in
-    light areas the cyan may be replaced by 3 times as much light
-    cyan.  However, this only works up to a certain point; beyond that
-    point, adding more light ink does not significantly increase the
-    darkness of the ink.  These transition values adjust the limits at
-    which the ink substitution is done; the lower these limits are
-    set, the lighter the output at which dark ink is introduced.
-    Setting these values lower will generally yield more accurate
-    midtone colors at the expense of more speckling in the light
-    midtones and highlights.  Generally these values need to be lower
-    on low-quality paper than on high quality glossy paper.
-
-        Dark Yellow Transition Value
-        Light Gray Transition Value
-        Mid Gray Transition Value
-        Dark Gray Transition Value
-        Gray Transition Value
-        Light Cyan Transition Value
-        Light Magenta Transition Value
-        Light Yellow Transition Value
-
-
-Foomatic-only options
-
-    This control is available only when using the Foomatic interface.
-    It provides a collection of presets appropriate for various
-    printing tasks.  It is similar in concept to (and provided the
-    inspiration for) the Print Quality and Image Type options provided
-    in Gutenprint.
-
-        Printout Mode
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index 359a22e..e06ea8e 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -3207,172 +3207,172 @@
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga132</anchor>
+      <anchor>ga133</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga132a7</anchor>
+      <anchor>gga133a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga132a8</anchor>
+      <anchor>gga133a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga132a9</anchor>
+      <anchor>gga133a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga132a10</anchor>
+      <anchor>gga133a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga132a11</anchor>
+      <anchor>gga133a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga132a12</anchor>
+      <anchor>gga133a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga132a13</anchor>
+      <anchor>gga133a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga132a14</anchor>
+      <anchor>gga133a14</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga132a15</anchor>
+      <anchor>gga133a15</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga132a16</anchor>
+      <anchor>gga133a16</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga133</anchor>
+      <anchor>ga134</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga133a17</anchor>
+      <anchor>gga134a17</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga133a18</anchor>
+      <anchor>gga134a18</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga133a19</anchor>
+      <anchor>gga134a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga133a20</anchor>
+      <anchor>gga134a20</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga134</anchor>
+      <anchor>ga135</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga134a21</anchor>
+      <anchor>gga135a21</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga134a22</anchor>
+      <anchor>gga135a22</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga134a23</anchor>
+      <anchor>gga135a23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga134a24</anchor>
+      <anchor>gga135a24</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga134a25</anchor>
+      <anchor>gga135a25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga134a26</anchor>
+      <anchor>gga135a26</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga134a27</anchor>
+      <anchor>gga135a27</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga134a28</anchor>
+      <anchor>gga135a28</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga134a29</anchor>
+      <anchor>gga135a29</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga135</anchor>
+      <anchor>ga136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga135a30</anchor>
+      <anchor>gga136a30</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga135a31</anchor>
+      <anchor>gga136a31</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga135a32</anchor>
+      <anchor>gga136a32</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga136</anchor>
+      <anchor>ga137</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga136a33</anchor>
+      <anchor>gga137a33</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga136a34</anchor>
+      <anchor>gga137a34</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga136a35</anchor>
+      <anchor>gga137a35</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
@@ -4168,86 +4168,93 @@
     </member>
     <member kind="function">
       <type>void</type>
-      <name>stp_get_size_limit</name>
+      <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>ga120</anchor>
+      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_get_size_limit</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ga121</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>ga122</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>ga123</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>ga124</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>ga125</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>ga126</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>ga127</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>ga128</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>ga129</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>ga130</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>ga131</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>ga132</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
@@ -5755,51 +5762,58 @@
     </member>
     <member kind="variable">
       <type>void(*</type>
-      <name>limit</name>
+      <name>maximum_imageable_area</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
       <anchor>o4</anchor>
+      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>limit</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>o5</anchor>
       <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>print</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>o6</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>describe_resolution</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>o7</anchor>
       <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="variable">
       <type>const char *(*</type>
       <name>describe_output</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>o8</anchor>
       <arglist>)(const stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>verify</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>o9</anchor>
       <arglist>)(stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>start_job</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>o10</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>end_job</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>o11</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
   </compound>
@@ -7927,172 +7941,172 @@
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga132</anchor>
+      <anchor>ga133</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga132a7</anchor>
+      <anchor>gga133a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga132a8</anchor>
+      <anchor>gga133a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga132a9</anchor>
+      <anchor>gga133a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga132a10</anchor>
+      <anchor>gga133a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga132a11</anchor>
+      <anchor>gga133a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga132a12</anchor>
+      <anchor>gga133a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga132a13</anchor>
+      <anchor>gga133a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga132a14</anchor>
+      <anchor>gga133a14</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga132a15</anchor>
+      <anchor>gga133a15</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga132a16</anchor>
+      <anchor>gga133a16</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga133</anchor>
+      <anchor>ga134</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga133a17</anchor>
+      <anchor>gga134a17</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga133a18</anchor>
+      <anchor>gga134a18</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga133a19</anchor>
+      <anchor>gga134a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga133a20</anchor>
+      <anchor>gga134a20</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga134</anchor>
+      <anchor>ga135</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga134a21</anchor>
+      <anchor>gga135a21</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga134a22</anchor>
+      <anchor>gga135a22</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga134a23</anchor>
+      <anchor>gga135a23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga134a24</anchor>
+      <anchor>gga135a24</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga134a25</anchor>
+      <anchor>gga135a25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga134a26</anchor>
+      <anchor>gga135a26</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga134a27</anchor>
+      <anchor>gga135a27</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga134a28</anchor>
+      <anchor>gga135a28</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga134a29</anchor>
+      <anchor>gga135a29</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga135</anchor>
+      <anchor>ga136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga135a30</anchor>
+      <anchor>gga136a30</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga135a31</anchor>
+      <anchor>gga136a31</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga135a32</anchor>
+      <anchor>gga136a32</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga136</anchor>
+      <anchor>ga137</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga136a33</anchor>
+      <anchor>gga137a33</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga136a34</anchor>
+      <anchor>gga137a34</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga136a35</anchor>
+      <anchor>gga137a35</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
@@ -8888,86 +8902,93 @@
     </member>
     <member kind="function">
       <type>void</type>
-      <name>stp_get_size_limit</name>
+      <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>ga120</anchor>
+      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_get_size_limit</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ga121</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>ga122</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>ga123</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>ga124</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>ga125</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>ga126</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>ga127</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>ga128</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>ga129</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>ga130</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>ga131</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>ga132</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index 0ea0f62..413385e 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -40,7 +40,7 @@
   <tr><td class="indexkey"><a class="el" href="structstp__shade.html">stp_shade</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index b571c08..1ca509f 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -54,7 +54,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Array functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 8d33a81..b3fb246 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -548,7 +548,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index 1816ca9..44974eb 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -947,7 +947,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 1d86119..2f3d301 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -10,7 +10,7 @@
 <tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family.html">stp_family</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image.html">stp_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module.html">stp_module</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 9dd0774..b4f454a 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -53,7 +53,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Color functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 7951a7f..c0ab451 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -440,7 +440,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 76c8ff7..0caf28e 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -186,7 +186,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 04fdb80..61e49bb 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -14,7 +14,7 @@
 <dt>Global <a class="el" href="group__vars.html#ga37">stp_merge_printvars</a>  </dt>
 <dd>This is likely to go away.</dd>
 </dl>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html
index be119bc..7948f7e 100644
--- a/doc/gutenprint/html/dir_000000.html
+++ b/doc/gutenprint/html/dir_000000.html
@@ -13,7 +13,7 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprint</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir_000001.html
index 300dc2f..85c0fdc 100644
--- a/doc/gutenprint/html/dir_000001.html
+++ b/doc/gutenprint/html/dir_000001.html
@@ -136,7 +136,7 @@
 
 <p>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html
index 74629ea..f65ec89 100644
--- a/doc/gutenprint/html/dirs.html
+++ b/doc/gutenprint/html/dirs.html
@@ -11,7 +11,7 @@
 <li><a class="el" href="dir_000001.html">gutenprint</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 626ae0f..fcedfa2 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -1815,7 +1815,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 355f011..47c0ce2 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -32,7 +32,7 @@
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index 6fd2d38..b43b16a 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -40,15 +40,15 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
 : <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
 : <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>describe_parameter
+: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>describe_parameter
 : <a class="el" href="structstp__colorfuncs__t.html#o3">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>dimension
+: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>dimension
 : <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
 : <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
 : <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>end_pos
+: <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t</a><li>end_pos
 : <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
 : <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
@@ -84,7 +84,7 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
 : <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
 : <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>list_parameters
 : <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t</a><li>logicalpassstart
 : <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
 : <a class="el" href="structstp__color.html#o1">stp_color</a><li>lower
@@ -92,7 +92,8 @@ Here is a list of all struct and union fields with links to the structures/union
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
 : <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>media_size
+: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>maximum_imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>media_size
 : <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
 : <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
 : <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
@@ -119,7 +120,7 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
 : <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
 : <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>printer_list
+: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>printer_list
 : <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
 : <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
@@ -134,7 +135,7 @@ 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#o2">stp_cached_curve_t</a><li>short_name
 : <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>start_pos
+: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>start_pos
 : <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
 : <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
 : <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
@@ -153,7 +154,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>v
 : <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
 : <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>verify_this_parameter
+: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>verify_this_parameter
 : <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
 : <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
@@ -170,7 +171,7 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
 : <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
 : <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index 1dd927f..362e67e 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -40,15 +40,15 @@
 : <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
 : <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
 : <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>describe_parameter
+: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>describe_parameter
 : <a class="el" href="structstp__colorfuncs__t.html#o3">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>dimension
+: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>dimension
 : <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
 : <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
 : <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>end_pos
+: <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t</a><li>end_pos
 : <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
 : <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
@@ -84,7 +84,7 @@
 : <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
 : <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
 : <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>list_parameters
 : <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t</a><li>logicalpassstart
 : <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
 : <a class="el" href="structstp__color.html#o1">stp_color</a><li>lower
@@ -92,7 +92,8 @@
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
 : <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>media_size
+: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>maximum_imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>media_size
 : <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
 : <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
 : <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
@@ -119,7 +120,7 @@
 : <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
 : <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
 : <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>printer_list
+: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>printer_list
 : <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
 : <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
@@ -134,7 +135,7 @@
 <li>s_cache
 : <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t</a><li>short_name
 : <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>start_pos
+: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>start_pos
 : <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
 : <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
 : <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
@@ -153,7 +154,7 @@
 <li>v
 : <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
 : <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>verify_this_parameter
+: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>verify_this_parameter
 : <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
 : <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
@@ -170,7 +171,7 @@
 : <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
 : <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
 : <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 32d8b1b..027e2cb 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
 : <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index 0666089..efe1fa0 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
 : <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 44deb8e..0b605cf 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -17,7 +17,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
 : <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
 : <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 8af98da..70473b1 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -15,7 +15,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>dcgettext
 : <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
 : <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index 2f8dfbb..26575e7 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
 : <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 4495526..dbea7ab 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
 : <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 80f4f6a..3716d6f 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -17,10 +17,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
 : <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
 : <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga136a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga136a34">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__vars.html#gga137a33">vars.h</a><li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gga137a35">vars.h</a><li>PARAMETER_OK
+: <a class="el" href="group__vars.html#gga137a34">vars.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index b1d4327..d0e3ed8 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
 : <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_array_copy()
+: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_array_copy()
 : <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
 : <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
 : <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
@@ -92,7 +92,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="weave_8h.html#a10">weave.h</a><li>stp_const_parameter_list_t
 : <a class="el" href="group__vars.html#ga2">vars.h</a><li>stp_copy_data_func_t
 : <a class="el" href="group__vars.html#ga4">vars.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>STP_CURRENT_INTERFACE
+: <a class="el" href="group__vars.html#ga131">vars.h</a><li>STP_CURRENT_INTERFACE
 : <a class="el" href="group__version.html#ga10">gutenprint-version.h</a><li>stp_current_interface
 : <a class="el" href="group__version.html#ga3">gutenprint-version.h</a><li>STP_CURVE_BOUNDS_CLIP
 : <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
@@ -189,12 +189,12 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#ga41">util.h</a><li>STP_DBG_XML
 : <a class="el" href="group__util.html#ga49">util.h</a><li>stp_default_media_size()
 : <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_deprintf()
+: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_deprintf()
 : <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
 : <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
 : <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_dither()
+: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_dither()
 : <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
 : <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
 : <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
@@ -242,7 +242,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_t
 : <a class="el" href="group__printer.html#ga1">printers.h</a><li>stp_family_unregister()
 : <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_fill_tiff
+: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_fill_tiff
 : <a class="el" href="weave_8h.html#a7">weave.h</a><li>stp_fill_uncompressed
 : <a class="el" href="weave_8h.html#a8">weave.h</a><li>stp_fillfunc
 : <a class="el" href="weave_8h.html#a2">weave.h</a><li>stp_find_standard_dither_array()
@@ -261,7 +261,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
 : <a class="el" href="group__color.html#ga8">color.h</a><li>stp_get_color_conversion()
 : <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_get_curve_parameter()
 : <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
 : <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
 : <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
@@ -282,7 +282,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
 : <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
 : <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_media_size()
+: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_maximum_imageable_area()
+: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_media_size()
 : <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
 : <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
 : <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
@@ -302,11 +303,11 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
 : <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
 : <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_get_string_parameter()
 : <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
 : <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
 : <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_get_version()
+: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_get_version()
 : <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
 : <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
 : <a class="el" href="group__image.html#ga7">image.h</a><li>stp_image_get_appname()
@@ -361,9 +362,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="weave_8h.html#a0">weave.h</a><li>stp_merge_printvars()
 : <a class="el" href="group__vars.html#ga37">vars.h</a><li>STP_MICRO_VERSION
 : <a class="el" href="group__version.html#ga9">gutenprint-version.h</a><li>stp_micro_version
-: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>stp_minor_version
-: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>STP_MINOR_VERSION
-: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>STP_MODULE
+: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>STP_MINOR_VERSION
+: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>stp_minor_version
+: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>STP_MODULE
 : <a class="el" href="gutenprint-module_8h.html#a0">gutenprint-module.h</a><li>STP_MODULE_CLASS_COLOR
 : <a class="el" href="module_8h.html#a13a5">module.h</a><li>STP_MODULE_CLASS_DITHER
 : <a class="el" href="module_8h.html#a13a6">module.h</a><li>STP_MODULE_CLASS_FAMILY
@@ -433,28 +434,28 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="weave_8h.html#a6">weave.h</a><li>stp_packfunc
 : <a class="el" href="weave_8h.html#a1">weave.h</a><li>stp_papersize_unit_t
 : <a class="el" href="group__papersize.html#ga5">paper.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga135a32">vars.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga133a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga133a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga133a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga133a18">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga135a31">vars.h</a><li>stp_parameter_description_destroy()
+: <a class="el" href="group__vars.html#gga136a32">vars.h</a><li>stp_parameter_activity_t
+: <a class="el" href="group__vars.html#ga136">vars.h</a><li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gga134a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gga134a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gga134a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gga134a18">vars.h</a><li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#ga134">vars.h</a><li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#gga136a31">vars.h</a><li>stp_parameter_description_destroy()
 : <a class="el" href="group__vars.html#ga48">vars.h</a><li>stp_parameter_find()
 : <a class="el" href="group__vars.html#ga40">vars.h</a><li>stp_parameter_find_in_settings()
 : <a class="el" href="group__vars.html#ga49">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga135a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga134a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga134a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga134a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga134a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga134a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga134a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga134a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga134a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga134a29">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_list_add_param()
+: <a class="el" href="group__vars.html#gga136a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#gga135a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#gga135a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#gga135a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#gga135a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#gga135a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#gga135a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#gga135a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#gga135a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#gga135a29">vars.h</a><li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_list_add_param()
 : <a class="el" href="group__vars.html#ga44">vars.h</a><li>stp_parameter_list_append()
 : <a class="el" href="group__vars.html#ga46">vars.h</a><li>stp_parameter_list_copy()
 : <a class="el" href="group__vars.html#ga45">vars.h</a><li>stp_parameter_list_count()
@@ -463,18 +464,18 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#ga42">vars.h</a><li>stp_parameter_list_param()
 : <a class="el" href="group__vars.html#ga41">vars.h</a><li>stp_parameter_list_t
 : <a class="el" href="group__vars.html#ga1">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga132a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga132a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga132a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga132a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga132a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga132a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga132a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga132a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga132a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga132a7">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_path_search()
+: <a class="el" href="group__vars.html#gga133a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gga133a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gga133a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gga133a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gga133a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gga133a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gga133a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gga133a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gga133a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gga133a7">vars.h</a><li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#ga137">vars.h</a><li>stp_path_search()
 : <a class="el" href="path_8h.html#a0">path.h</a><li>stp_path_split()
 : <a class="el" href="path_8h.html#a1">path.h</a><li>stp_print()
 : <a class="el" href="group__printer.html#ga15">printers.h</a><li>stp_printer_describe_parameter()
@@ -578,7 +579,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
 : <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
 : <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_set_width()
+: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_set_width()
 : <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_shade_t
 : <a class="el" href="dither_8h.html#a10">dither.h</a><li>stp_split_2()
 : <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
@@ -609,8 +610,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
 : <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_vars_t
 : <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_verify_printer_params()
+: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_verify_printer_params()
 : <a class="el" href="group__printer.html#ga19">printers.h</a><li>STP_WEAVE_ASCENDING
 : <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
 : <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
@@ -639,7 +640,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
 : <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
 : <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index 0e627b4..17332e8 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
 : <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index e834c2a..92a23c6 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -88,7 +88,7 @@
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
 : <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index 6540637..8350a00 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -18,13 +18,13 @@
 : <a class="el" href="module_8h.html#a13">module.h</a><li>stp_mxml_type_e
 : <a class="el" href="mxml_8h.html#a43">mxml.h</a><li>stp_papersize_unit_t
 : <a class="el" href="group__papersize.html#ga5">paper.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_weave_strategy_t
+: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#ga137">vars.h</a><li>stp_weave_strategy_t
 : <a class="el" href="weave_8h.html#a26">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index 92ca001..d2d94ee 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -17,9 +17,9 @@
 : <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
 : <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
 : <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga136a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga136a34">vars.h</a></ul>
+: <a class="el" href="group__vars.html#gga137a33">vars.h</a><li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gga137a35">vars.h</a><li>PARAMETER_OK
+: <a class="el" href="group__vars.html#gga137a34">vars.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_CURVE_BOUNDS_CLIP
 : <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
@@ -44,39 +44,39 @@
 : <a class="el" href="mxml_8h.html#a43a22">mxml.h</a><li>STP_MXML_REAL
 : <a class="el" href="mxml_8h.html#a43a23">mxml.h</a><li>STP_MXML_TEXT
 : <a class="el" href="mxml_8h.html#a43a24">mxml.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga135a32">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga133a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga133a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga133a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga133a18">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga135a31">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga135a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga134a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga134a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga134a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga134a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga134a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga134a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga134a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga134a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga134a29">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga132a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga132a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga132a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga132a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga132a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga132a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga132a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga132a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga132a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga132a7">vars.h</a><li>STP_WEAVE_ASCENDING
+: <a class="el" href="group__vars.html#gga136a32">vars.h</a><li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gga134a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gga134a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gga134a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gga134a18">vars.h</a><li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#gga136a31">vars.h</a><li>STP_PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gga136a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#gga135a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#gga135a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#gga135a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#gga135a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#gga135a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#gga135a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#gga135a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#gga135a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#gga135a29">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
+: <a class="el" href="group__vars.html#gga133a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gga133a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gga133a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gga133a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gga133a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gga133a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gga133a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gga133a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gga133a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gga133a7">vars.h</a><li>STP_WEAVE_ASCENDING
 : <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
 : <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
 : <a class="el" href="weave_8h.html#a26a16">weave.h</a><li>STP_WEAVE_DESCENDING
 : <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>STP_WEAVE_STAGGERED
 : <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>STP_WEAVE_ZIGZAG
 : <a class="el" href="weave_8h.html#a26a11">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 3a14614..dd9a1d1 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -14,7 +14,7 @@
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
 : <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_array_copy()
+: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_array_copy()
 : <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
 : <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
 : <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
@@ -81,7 +81,7 @@
 : <a class="el" href="group__color.html#ga3">color.h</a><li>stp_color_register()
 : <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_unregister()
 : <a class="el" href="group__color.html#ga6">color.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_curve_cache_copy()
+: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_curve_cache_copy()
 : <a class="el" href="curve-cache_8h.html#a12">curve-cache.h</a><li>stp_curve_cache_curve_data()
 : <a class="el" href="curve-cache_8h.html#a4">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
 : <a class="el" href="curve-cache_8h.html#a6">curve-cache.h</a><li>stp_curve_cache_get_count()
@@ -140,12 +140,12 @@
 : <a class="el" href="group__curve.html#ga41">curve.h</a><li>stp_curve_write_string()
 : <a class="el" href="group__curve.html#ga42">curve.h</a><li>stp_default_media_size()
 : <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_deprintf()
+: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_deprintf()
 : <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
 : <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
 : <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_dither()
+: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_dither()
 : <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
 : <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
 : <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
@@ -183,7 +183,7 @@
 : <a class="el" href="group__util.html#ga14">util.h</a><li>stp_family_register()
 : <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_unregister()
 : <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_find_standard_dither_array()
+: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_find_standard_dither_array()
 : <a class="el" href="dither_8h.html#a22">dither.h</a><li>stp_flush_all()
 : <a class="el" href="weave_8h.html#a18">weave.h</a><li>stp_flush_debug_messages()
 : <a class="el" href="group__util.html#ga23">util.h</a><li>stp_fold()
@@ -197,7 +197,7 @@
 : <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
 : <a class="el" href="group__color.html#ga8">color.h</a><li>stp_get_color_conversion()
 : <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_get_curve_parameter()
 : <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
 : <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
 : <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
@@ -218,7 +218,8 @@
 : <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
 : <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
 : <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_media_size()
+: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_maximum_imageable_area()
+: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_media_size()
 : <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
 : <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
 : <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
@@ -238,11 +239,11 @@
 : <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
 : <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
 : <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_get_string_parameter()
 : <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
 : <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
 : <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_get_version()
+: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_get_version()
 : <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
 : <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
 : <a class="el" href="group__image.html#ga7">image.h</a><li>stp_image_get_appname()
@@ -419,7 +420,7 @@
 : <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
 : <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
 : <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_set_width()
+: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_set_width()
 : <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_split_2()
 : <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
 : <a class="el" href="bit-ops_8h.html#a2">bit-ops.h</a><li>stp_start_job()
@@ -447,8 +448,8 @@
 : <a class="el" href="group__vars.html#ga7">vars.h</a><li>stp_vars_create_copy()
 : <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
 : <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_verify_printer_params()
+: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_verify_printer_params()
 : <a class="el" href="group__printer.html#ga19">printers.h</a><li>stp_weave_parameters_by_row()
 : <a class="el" href="weave_8h.html#a25">weave.h</a><li>stp_write_weave()
 : <a class="el" href="weave_8h.html#a19">weave.h</a><li>stp_xml_exit()
@@ -469,7 +470,7 @@
 : <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
 : <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
 : <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index 3da366e..829c405 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -55,7 +55,7 @@
 : <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_vars_t
 : <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_xml_parse_func
 : <a class="el" href="xml_8h.html#a0">xml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index 68f42da..bee2dca 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -22,7 +22,7 @@
 : <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>stp_pack_tiff
 : <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
 : <a class="el" href="weave_8h.html#a6">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 9e5678b..df6ccbc 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -600,7 +600,7 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index d4ed9ff..6c5eec8 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -497,7 +497,7 @@ Get a color module by its name.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index aab61b8..d6b93ac 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -2463,7 +2463,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index 8a70c36..fadf28c 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -346,7 +346,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 036e11e..a34473c 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -236,7 +236,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index f9f8009..fd6d28c 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -236,7 +236,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 6f5653e..c14ff84 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -1305,7 +1305,7 @@ This callback function will be called to determine the sort order for list items
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index 088a171..f2d4c14 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -270,7 +270,7 @@ Get the number of available papersizes.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 275fc19..1d8c9aa 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -990,7 +990,7 @@ Start a print job.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index 857f0f9..333f5fa 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -1477,7 +1477,7 @@ Set the data in a sequence from unsigned short values.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index 4cae95c..ccb108c 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -1828,7 +1828,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index a01bec1..d98ce3b 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -41,55 +41,55 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
 
 <tr><td 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#ga132">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga132a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga132a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga132a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gga133a8">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gga133a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gga133a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga132a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga132a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga132a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a11">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gga133a12">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gga133a13">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gga133a14">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga132a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gga133a16">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga132">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga133a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga133a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga133a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga133a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga134a17">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gga134a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gga134a19">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gga134a20">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga134a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga134a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga134a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a21">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#gga135a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#gga135a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#gga135a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga134a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga134a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga134a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#gga135a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#gga135a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#gga135a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a29">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga135a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga135a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga135a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga136a30">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#gga136a31">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#gga136a32">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga136a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga136a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga136a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga136">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga137a33">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#gga137a34">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#gga137a35">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -345,85 +345,85 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#ga117"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
@@ -432,33 +432,36 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="#ga120"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#ga121"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga122"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#ga123"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#ga124"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
@@ -643,13 +646,13 @@ The vars opaque data type.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga135"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga135" args="" --><p>
+<a class="anchor" name="ga136"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga136" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -667,24 +670,24 @@ Parameter activity.
 <p>
 Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off".<dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga135a30"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gga135a30" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a30"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gga136a30" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
 Parameter is inactive (unused). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a31"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gga135a31" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a31"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gga136a31" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
 Parameter is set to its default value. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a32"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gga135a32" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a32"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gga136a32" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
 Parameter is active (used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga133"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga133" args="" --><p>
+<a class="anchor" name="ga134"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga134" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -702,26 +705,26 @@ Parameter class.
 <p>
 What kind of setting this is, for the purpose of user interface representation.<dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga133a17"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gga133a17" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga134a17"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gga134a17" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
 Printer feature. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a18"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gga133a18" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga134a18"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gga134a18" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
 Output control. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a19"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gga133a19" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga134a19"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gga134a19" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
 Core Gimp-Print parameter. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a20"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gga133a20" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga134a20"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gga134a20" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
 Invalid class (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga134"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="ga134" args="" --><p>
+<a class="anchor" name="ga135"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="ga135" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -739,36 +742,36 @@ Parameter level.
 <p>
 What "level" a setting is at, for UI design.<dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga134a21"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="gga134a21" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a21"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="gga135a21" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
 Basic parameter, shown by all UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a22"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="gga134a22" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a22"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="gga135a22" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
 Advanced parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a23"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="gga134a23" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a23"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="gga135a23" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
 Advanced1 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a24"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="gga134a24" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a24"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="gga135a24" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
 Advanced2 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a25"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="gga134a25" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a25"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="gga135a25" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
 Advanced3 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a26"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="gga134a26" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a26"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="gga135a26" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
 Advanced4 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a27"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="gga134a27" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a27"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="gga135a27" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
 Parameters used only within Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a28"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="gga134a28" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a28"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="gga135a28" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
 Parameters used only outside Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a29"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="gga134a29" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga135a29"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="gga135a29" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
 Invalid level (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga132"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga132" args="" --><p>
+<a class="anchor" name="ga133"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga133" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -786,38 +789,38 @@ Parameter types.
 <p>
 The following types are permitted for a printer setting. Not all are currently implemented.<dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga132a7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gga132a7" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gga133a7" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
 Single string choice from a list. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a8"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gga132a8" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a8"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gga133a8" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
 Integer. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gga132a9" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gga133a9" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
 Boolean. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a10"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gga132a10" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a10"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gga133a10" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
 Floating point number. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a11"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gga132a11" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a11"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gga133a11" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
 Curve. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a12"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gga132a12" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a12"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gga133a12" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
 Filename (NYI, need to consider security). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a13"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gga132a13" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a13"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gga133a13" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
 Raw, opaque data. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a14"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gga132a14" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a14"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gga133a14" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
 Array. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a15"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gga132a15" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a15"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gga133a15" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
 Linear dimension. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a16"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gga132a16" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga133a16"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gga133a16" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
 Invalid type (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga136"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="ga136" args="" --><p>
+<a class="anchor" name="ga137"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="ga137" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -833,11 +836,11 @@ Invalid type (should never be used). </td></tr>
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga136a33"></a><!-- doxytag: member="PARAMETER_BAD" ref="gga136a33" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga137a33"></a><!-- doxytag: member="PARAMETER_BAD" ref="gga137a33" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a34"></a><!-- doxytag: member="PARAMETER_OK" ref="gga136a34" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga137a34"></a><!-- doxytag: member="PARAMETER_OK" ref="gga137a34" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a35"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gga136a35" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga137a35"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gga137a35" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -845,7 +848,7 @@ Invalid type (should never be used). </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga124"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="ga124" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" --><p>
+<a class="anchor" name="ga125"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="ga125" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -920,7 +923,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -972,7 +975,7 @@ Check if an array parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1024,7 +1027,7 @@ Check if a boolean parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1076,7 +1079,7 @@ Check if a curve parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1128,7 +1131,7 @@ Check if a dimension parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1180,7 +1183,7 @@ Check if a file parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1232,7 +1235,7 @@ Check if a float parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1284,7 +1287,7 @@ Check if an integer parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1336,7 +1339,7 @@ Check if a raw parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1773,7 +1776,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga130"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="ga130" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
+<a class="anchor" name="ga131"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="ga131" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1810,7 +1813,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga123"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="ga123" args="(void)" --><p>
+<a class="anchor" name="ga124"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="ga124" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1893,7 +1896,7 @@ All of the parameter fields will be populated. <dl compact><dt><b>Parameters:</b
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga121"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="ga121" args="(const stp_vars_t *v, int *x, int *y)" --><p>
+<a class="anchor" name="ga122"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="ga122" args="(const stp_vars_t *v, int *x, int *y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1945,7 +1948,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga125"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="ga125" args="(stp_vars_t *v, const char *name)" --><p>
+<a class="anchor" name="ga126"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="ga126" args="(stp_vars_t *v, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1982,7 +1985,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga131"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="ga131" args="(stp_parameter_t *desc, const stp_parameter_t *param)" --><p>
+<a class="anchor" name="ga132"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="ga132" args="(stp_parameter_t *desc, const stp_parameter_t *param)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2071,7 +2074,7 @@ Get an array parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2163,7 +2166,7 @@ Get a boolean parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2234,7 +2237,7 @@ Get the name of the color conversion routine.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga126"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="ga126" args="(const stp_vars_t *v, const char *name)" --><p>
+<a class="anchor" name="ga127"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="ga127" args="(const stp_vars_t *v, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2323,7 +2326,7 @@ Get a curve parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2415,7 +2418,7 @@ Get a dimension parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2610,7 +2613,7 @@ Get a file parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2702,7 +2705,7 @@ Get a float parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2894,7 +2897,7 @@ Get an integer parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -2965,6 +2968,75 @@ Get the left edge of the image.
     </td>
   </tr>
 </table>
+<a class="anchor" name="ga120"></a><!-- doxytag: member="vars.h::stp_get_maximum_imageable_area" ref="ga120" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">void stp_get_maximum_imageable_area           </td>
+          <td class="md" valign="top">(&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="mdname" nowrap> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="md" nowrap align="right"></td>
+          <td class="md"></td>
+          <td class="md" nowrap>int *&nbsp;</td>
+          <td class="mdname" nowrap> <em>left</em>, </td>
+        </tr>
+        <tr>
+          <td class="md" nowrap align="right"></td>
+          <td class="md"></td>
+          <td class="md" nowrap>int *&nbsp;</td>
+          <td class="mdname" nowrap> <em>right</em>, </td>
+        </tr>
+        <tr>
+          <td class="md" nowrap align="right"></td>
+          <td class="md"></td>
+          <td class="md" nowrap>int *&nbsp;</td>
+          <td class="mdname" nowrap> <em>bottom</em>, </td>
+        </tr>
+        <tr>
+          <td class="md" nowrap align="right"></td>
+          <td class="md"></td>
+          <td class="md" nowrap>int *&nbsp;</td>
+          <td class="mdname" nowrap> <em>top</em></td>
+        </tr>
+        <tr>
+          <td class="md"></td>
+          <td class="md">)&nbsp;</td>
+          <td class="md" colspan="2"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+Get the maximum imagable area of the page. 
+<p>
+Retrieve the maximum (regardless of settings other than page sise) boundaries of the printable area of the page. In combination with the media size, this can be used to determine the actual printable region, which callers can use to place the image precisely. The dimensions are relative to the top left of the physical page.<p>
+If a customizable page size is used (see stp_printer_get_media_size), the actual desired width and/or height must be filled in using stp_set_page_width and/or stp_set_page_height. If these are not filled in, the margins will be returned.<p>
+Returned values may be negative if a printer is capable of full bleed by printing beyond the physical boundaries of the page.<p>
+If the media size stored in V is invalid, the return values will be indeterminate. It is up to the user to specify legal values. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>left</em>&nbsp;</td><td>a pointer to a int to store the left edge in. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>right</em>&nbsp;</td><td>a pointer to a int to store the right edge in. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bottom</em>&nbsp;</td><td>a pointer to a int to store the bottom edge in. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in.</td></tr>
+  </table>
+</dl>
+    </td>
+  </tr>
+</table>
 <a class="anchor" name="ga118"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="ga118" args="(const stp_vars_t *v, int *width, int *height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
@@ -3239,7 +3311,7 @@ Get a raw parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -3279,7 +3351,7 @@ Get the activity status of a raw parameter.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga120"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="ga120" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
+<a class="anchor" name="ga121"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="ga121" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3397,7 +3469,7 @@ Get a string parameter.
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -3468,7 +3540,7 @@ Get the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga128"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga128" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga129"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga129" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4098,7 +4170,7 @@ Set an array parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4202,7 +4274,7 @@ Set a boolean parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4403,7 +4475,7 @@ Set a curve parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5100,7 +5172,7 @@ Set a dimension parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5391,7 +5463,7 @@ Set a file parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5554,7 +5626,7 @@ Set a float parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5703,7 +5775,7 @@ Set an integer parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6039,7 +6111,7 @@ Set a raw parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6143,7 +6215,7 @@ Set a string parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6279,7 +6351,7 @@ Set the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga129"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga129" args="(stp_vars_t *v, int value)" --><p>
+<a class="anchor" name="ga130"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga130" args="(stp_vars_t *v, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6508,7 +6580,7 @@ It is an error to destroy the vars more than once. <dl compact><dt><b>Parameters
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga122"></a><!-- doxytag: member="vars.h::stp_verify" ref="ga122" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga123"></a><!-- doxytag: member="vars.h::stp_verify" ref="ga123" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6544,13 +6616,13 @@ Verify that the parameters selected are consistent with those allowed by the dri
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga127"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="ga127" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
+<a class="anchor" name="ga128"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="ga128" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> stp_verify_parameter           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> stp_verify_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
@@ -6587,7 +6659,7 @@ Verify that the parameters selected are consistent with those allowed by the dri
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index 99cd7cd..50e4153 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -434,7 +434,7 @@ The library minor version number.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
index 15282a1..4b9c33d 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -31,7 +31,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index 5127e52..8b0eb1c 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -31,7 +31,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index c05fdc3..c17edae 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -52,7 +52,7 @@ This header includes all of the public headers used by modules.<hr><h2>Define Do
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index 61df7f6..e58b6a1 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -53,7 +53,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Version functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 1e29c7c..5e90dce 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -27,7 +27,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Gutenprint master header. 
 <p>
-This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index bb254e2..7fc81d0 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -47,7 +47,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Image functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 12b5b75..76a01f3 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -7,7 +7,7 @@
 <div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.0.0-rc3 </h3><hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index 3b7938f..b3b2de4 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -113,7 +113,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Generic list functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index d3174c8..e83f397 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -304,7 +304,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index a1acb0e..5f5639b 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -20,7 +20,7 @@
 <li><a class="el" href="group__util.html">util</a>
 <li><a class="el" href="group__vars.html">vars</a>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index ca600fe..90aa0ae 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -1360,7 +1360,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index 8aba885..e969ca8 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -9,7 +9,7 @@
 <li><a class="el" href="deprecated.html">Deprecated List</a>
 
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index c987743..d2314d2 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -43,7 +43,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Paper size functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 8bd6b7f..3e6ec1d 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -95,7 +95,7 @@ Simple directory path functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 5afc427..d5bdf25 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -93,7 +93,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Printer functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index fc6a343..2d5f018 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -104,7 +104,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Sequence functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index ed0752b..73491b2 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -411,7 +411,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index 8c60728..f891c64 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -389,7 +389,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html
index ab5987c..57c2a8a 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -114,7 +114,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 5fd1475..85e7926 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -92,7 +92,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index f87b829..c383ca9 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -117,7 +117,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html
index 62a667b..01259d8 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -79,7 +79,7 @@ Vertical position.
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
index 2e41381..fb6f930 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -139,7 +139,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
index 5651f5a..7aea8ad 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -139,7 +139,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
index 831ba2d..daf45fe 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -139,7 +139,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index 1797d6d..e86eafb 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index b9bf4f2..6f15622 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -73,7 +73,7 @@ Upper bound.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index 5d7f701..60db122 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -67,7 +67,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index fabceaf..07c1f55 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -278,7 +278,7 @@ This callback returns the width of the image in pixels.
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="image_8h.html">image.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html
index 2c5fb30..12cfe54 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -73,7 +73,7 @@ Upper bound.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 2b20501..9412037 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index 5abb32a..e5e3a6d 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -89,7 +89,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index 3efe6c8..73caa9f 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index cecf414..d28cb24 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 7b7a832..e07263c 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 61911f7..72e83e5 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -214,7 +214,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index c23f3ab..e5891d2 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
index 979521b..fb4ead4 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index 6f8bc86..543372a 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -189,7 +189,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
index 528d820..951c0a6 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -64,7 +64,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
index 1dcc51f..29f41e0 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -89,7 +89,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 46fbb58..d8996b2 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -303,7 +303,7 @@ Paper width.
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html
index 6e09bdd..47ef8ff 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -72,7 +72,7 @@ Human-readable (translated) text.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 18b6491..2f91771 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -24,11 +24,11 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o3">help</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o4">p_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o4">p_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o5">p_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o5">p_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o6">p_level</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o6">p_level</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o7">is_mandatory</a></td></tr>
 
@@ -522,7 +522,7 @@ Internal name (key).     </td>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t::p_class</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t::p_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -545,7 +545,7 @@ Parameter class.     </td>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t::p_level</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t::p_level</a>          </td>
         </tr>
       </table>
     </td>
@@ -568,7 +568,7 @@ Parameter level.     </td>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t::p_type</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t::p_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -702,7 +702,7 @@ Should the verify system check this parameter?     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 75d2a76..7b0451a 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -164,7 +164,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index b2c58e4..3dd2908 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -21,29 +21,31 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o3">imageable_area</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o4">limit</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o4">maximum_imageable_area</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o5">print</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o5">limit</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o6">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o6">print</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o7">describe_output</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o7">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o8">verify</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o8">describe_output</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o9">start_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o9">verify</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o10">end_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o10">start_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o11">end_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="o7" args=")(const stp_vars_t *v)" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="o8" args=")(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +62,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="o6" args=")(const stp_vars_t *v, int *x, int *y)" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="o7" args=")(const stp_vars_t *v, int *x, int *y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)          </td>
         </tr>
       </table>
     </td>
@@ -83,13 +85,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="o10" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="o11"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="o11" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +131,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="o4" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="o5" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
         </tr>
       </table>
     </td>
@@ -175,6 +177,29 @@
     </td>
   </tr>
 </table>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_printfuncs_t::maximum_imageable_area" ref="o4" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t::maximum_imageable_area</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
 <a class="anchor" name="o2"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="o2" args=")(const stp_vars_t *v, int *width, int *height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
@@ -221,13 +246,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="o5" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="o6" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -244,13 +269,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="o9" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="o10"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="o10" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -267,13 +292,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="o8" args=")(stp_vars_t *v)" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="o9" args=")(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -292,7 +317,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index 18da612..d2b01b1 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -73,7 +73,7 @@ Raw data.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index a3c84a9..47ca7b0 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -89,7 +89,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index f4461a9..f15fbde 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -189,7 +189,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index 5cd3ed1..b3ad3e3 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -139,7 +139,7 @@
 </table>
 <hr>The documentation for this union was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index 609bcf4..eb59f6c 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -133,7 +133,7 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 6c6b370..d9adc56 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -47,55 +47,55 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
 
 <tr><td 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#ga132">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga132a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga132a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga132a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gga133a8">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gga133a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gga133a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga132a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga132a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga132a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a11">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gga133a12">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gga133a13">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gga133a14">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga132a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gga133a16">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga132">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga133a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga133a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga133a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga133a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga134a17">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gga134a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gga134a19">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gga134a20">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga134a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga134a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga134a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a21">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#gga135a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#gga135a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#gga135a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga134a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga134a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga134a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#gga135a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#gga135a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#gga135a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a29">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga135a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga135a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga135a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga136a30">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#gga136a31">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#gga136a32">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga136a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga136a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga136a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga136">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga137a33">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#gga137a34">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#gga137a35">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -351,85 +351,85 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#ga117"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
@@ -438,39 +438,42 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="group__vars.html#ga120"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga121"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga122"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#ga123"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#ga124"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Print job functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 1bb83be..27e9bc9 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -815,7 +815,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index b86b49c..4b53ee1 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -693,7 +693,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index 03e317a..017a48b 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -13,7 +13,7 @@
   <tr><td class="indexkey"><a class="el" href="structstpui__image.html">stpui_image</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index d1da193..5ceab0b 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -10,7 +10,7 @@
 <tr><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
 </td></tr></table><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 20a76d4..78675a6 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -603,7 +603,7 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir_000000.html
index f6260ca..152aa31 100644
--- a/doc/gutenprintui2/html/dir_000000.html
+++ b/doc/gutenprintui2/html/dir_000000.html
@@ -13,7 +13,7 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprintui2</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir_000001.html
index 8ca16f0..8b622f5 100644
--- a/doc/gutenprintui2/html/dir_000001.html
+++ b/doc/gutenprintui2/html/dir_000001.html
@@ -19,7 +19,7 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html
index 27f7e4b..409002d 100644
--- a/doc/gutenprintui2/html/dirs.html
+++ b/doc/gutenprintui2/html/dirs.html
@@ -11,7 +11,7 @@
 <li><a class="el" href="dir_000001.html">gutenprintui2</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 9c8f278..9b79775 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -11,7 +11,7 @@
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index 50c3409..f8078ed 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -98,7 +98,7 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
 : <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
 : <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index cfe2602..2ce7df9 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -98,7 +98,7 @@
 : <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
 : <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
 : <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index d4e89e0..7dd92b5 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -308,7 +308,7 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index bc6c2d0..add5e7c 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -119,7 +119,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="curve_8h.html#a19">curve.h</a><li>StpuiGammaCurve
 : <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
 : <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 8564647..cb7913a 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -25,7 +25,7 @@
 : <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
 : <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
 : <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 36b9578..b2fc034 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -13,7 +13,7 @@
 : <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>orient_t
 : <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>StpuiCurveType
 : <a class="el" href="curve_8h.html#a19">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 9538097..00d0366 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -21,7 +21,7 @@
 : <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>STPUI_CURVE_TYPE_LINEAR
 : <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
 : <a class="el" href="curve_8h.html#a19a9">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 47630b0..6867abf 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -82,7 +82,7 @@
 : <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
 : <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
 : <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 70ab98e..d29c3c9 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -16,7 +16,7 @@
 : <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiGammaCurve
 : <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
 : <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 0bc9549..e1c0072 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -1946,7 +1946,7 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index fbf5b32..d132c22 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -7,7 +7,7 @@
 <div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.0.0-rc3 </h3><hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index 9b3c867..80ea194 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -389,7 +389,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 6918bf9..d87d58e 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -164,7 +164,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 1dfdb1d..896199c 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -189,7 +189,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index a4ede5a..2276c7d 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -139,7 +139,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index 658bf4f..c4a97e6 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -214,7 +214,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index c876e4c..78727a8 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -339,7 +339,7 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 8e8f648..974b9c8 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -180,7 +180,7 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
diff --git a/doc/users_guide/Makefile.am b/doc/users_guide/Makefile.am
new file mode 100644
index 0000000..f8636af
--- /dev/null
+++ b/doc/users_guide/Makefile.am
@@ -0,0 +1,543 @@
+## $Id: Makefile.am,v 1.44 2005/11/22 14:43:04 rleigh Exp $
+## Copyright (C) 2001 Andy Stewart and Roger Leigh
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+
+## Variables
+
+EPSLEVEL = 2
+
+UTIL_MANUAL = util-edition
+UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/utils.sgml \
+	$(srcdir)/gfdl.sgml
+
+GIMP_MANUAL = gimp-edition
+GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/gimp.sgml \
+	$(srcdir)/gfdl.sgml
+
+CUPS_MANUAL = cups-edition
+CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/cups.sgml \
+	$(srcdir)/gfdl.sgml
+
+MANUAL = users-guide
+MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/gimp.sgml \
+	$(srcdir)/cups.sgml \
+	$(srcdir)/utils.sgml \
+	$(srcdir)/gfdl.sgml
+
+UTIL_HTMLDIR = util_html
+GIMP_HTMLDIR = gimp_html
+CUPS_HTMLDIR = cups_html
+HTMLDIR = html
+
+UTIL_OUTPUTS = \
+ $(UTIL_MANUAL).pdf \
+ util_html
+
+GIMP_OUTPUTS = \
+ $(GIMP_MANUAL).pdf \
+ gimp_html
+
+CUPS_OUTPUTS = \
+ $(CUPS_MANUAL).pdf \
+ cups_html
+
+OUTPUTS = \
+ $(MANUAL).pdf \
+ html
+
+UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
+GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
+CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
+USER_GUIDE = $(MANUAL).pdf html
+
+if INSTALL_USER_GUIDE
+STANDARD_TARGETS = $(USER_GUIDE)
+endif
+
+DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
+
+UTIL_PNG_IMAGES =
+
+CUPS_PNG_IMAGES = \
+	figures/cups_admin.png				\
+	figures/cups_admin_device.png			\
+	figures/cups_admin_make.png			\
+	figures/cups_admin_model.png			\
+	figures/cups_admin_success.png			\
+	figures/cups_config_printer.png			\
+	figures/cups_my_printer.png			\
+	figures/cups_printers.png			\
+	figures/cups_startup.png
+
+GIMP_PNG_IMAGES = \
+	figures/gimp-print-gui-1.png			\
+	figures/gimp-print-gui.png			\
+	figures/gimp-print-new-printer.png		\
+	figures/gimp-print-print-color-adjust.png	\
+	figures/gimp-print-setup.png			\
+	figures/gimp_image.png				\
+	figures/gimp_startup.png
+
+PNG_IMAGES = \
+	$(CUPS_PNG_IMAGES) 				\
+	$(GIMP_PNG_IMAGES)
+
+DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
+
+UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
+GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
+CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
+EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
+
+if MAINTAINER_MODE
+MAINT_MODE = true
+else
+MAINT_MODE = false
+endif
+
+if MAINTAINER_MODE
+ALL_LOCAL_TARGETS = docs
+else
+ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
+endif
+
+## Rules
+
+dist-hook: $(USER_GUIDE)
+	for file in $(DISTHOOKFILES) ; do \
+	  if test -f $$file ; then \
+            if ! test -d $(distdir)/`dirname $$file` ; then \
+	      mkdir $(distdir)/`dirname $$file` ; \
+	    fi ; \
+	    cp -p $$file $(distdir)/`dirname $$file` ; \
+	  fi ; \
+	done
+	for dir in $(DISTHOOKDIRS) ; do \
+	  if test -d $(srcdir)/$$dir ; then \
+	    mkdir $(distdir)/$$dir; \
+	    for dirfile in $(srcdir)/$$dir/*; do \
+	      if test -f $$dirfile ; then \
+	        cp -p $$dirfile $(distdir)/$$dir ; \
+	      fi ; \
+	      if test -d $$dirfile ; then \
+	        cp -pR $$dirfile $(distdir)/$$dir ; \
+	      fi ; \
+	    done \
+	  fi \
+	done
+
+$(UTIL_MANUAL).pdf:  $(UTIL_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	fi ; \
+	$(DB2PDF) $(UTIL_MANUAL).sgml
+
+$(GIMP_MANUAL).pdf:  $(GIMP_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(GIMP_MANUAL).sgml
+
+$(CUPS_MANUAL).pdf:  $(CUPS_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(CUPS_MANUAL).sgml
+
+$(MANUAL).pdf:  $(MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(MANUAL).sgml
+
+editions:  docs cups_docs gimp_docs util_docs
+
+util_docs: util_html util_pdf
+gimp_docs: gimp_html gimp_pdf
+cups_docs: cups_html cups_pdf
+docs: html pdf
+
+all_util_docs: util_html util_ps util_pdf
+all_gimp_docs: gimp_html gimp_ps gimp_pdf
+all_cups_docs: cups_html cups_ps cups_pdf
+all_docs: html ps pdf
+
+all-local: $(ALL_LOCAL_TARGETS)
+
+util_pdf: $(UTIL_MANUAL).pdf
+gimp_pdf: $(GIMP_MANUAL).pdf
+cups_pdf: $(CUPS_MANUAL).pdf
+pdf: $(MANUAL).pdf
+
+util_ps: $(UTIL_MANUAL).ps
+gimp_ps: $(GIMP_MANUAL).ps
+cups_ps: $(CUPS_MANUAL).ps
+ps: $(MANUAL).ps
+
+$(UTIL_MANUAL).ps:  $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
+	for i in $(UTIL_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
+	$(DB2PS) $(UTIL_MANUAL)-eps.sgml
+	mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
+	for i in $(UTIL_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(GIMP_MANUAL).ps:  $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
+	for i in $(GIMP_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
+	$(DB2PS) $(GIMP_MANUAL)-eps.sgml
+	mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
+	for i in $(GIMP_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(CUPS_MANUAL).ps:  $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
+	for i in $(CUPS_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
+	$(DB2PS) $(CUPS_MANUAL)-eps.sgml
+	mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
+	for i in $(CUPS_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(MANUAL).ps:  $(MANUAL_SRC_FILES) $(EPS_IMAGES)
+	for i in $(MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
+	$(DB2PS) $(MANUAL)-eps.sgml
+	mv $(MANUAL)-eps.ps $(MANUAL).ps
+	for i in $(MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+%.eps:
+	if test ! -d figures ; then mkdir figures ; fi
+	$(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
+
+util_html: util-html-stamp
+gimp_html: gimp-html-stamp
+cups_html: cups-html-stamp
+html: html-stamp
+
+# This ugly workaround with SOURCE is because db2html doesn't seem to like
+# "./users-guide.sgml".  Note that db2ps does not have the same limitation.
+# html-stamp should *only* be called by html--it's just a timestamp!
+
+util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(UTIL_MANUAL).sgml
+	-$(RM) -rf $(UTIL_HTMLDIR)
+	mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
+	chmod a+rx $(UTIL_HTMLDIR)
+	touch util-html-stamp
+
+gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(GIMP_MANUAL).sgml
+	-mkdir $(GIMP_MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
+	  cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(GIMP_HTMLDIR)
+	mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
+	chmod a+rx $(GIMP_HTMLDIR)
+	touch gimp-html-stamp
+
+cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(CUPS_MANUAL).sgml
+	-mkdir $(CUPS_MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
+	  cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(CUPS_HTMLDIR)
+	mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
+	chmod a+rx $(CUPS_HTMLDIR)
+	touch cups-html-stamp
+
+html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(MANUAL).sgml
+	-mkdir $(MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
+	  cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(HTMLDIR)
+	mv $(MANUAL) $(HTMLDIR)
+	chmod a+rx $(HTMLDIR)
+	touch html-stamp
+
+install-data-local: $(STANDARD_TARGETS)
+	if test -n '$(STANDARD_TARGETS)' ; then \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
+	  if test -f $(MANUAL).pdf ; then \
+	    $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
+	  elif test -f $(srcdir)/$(MANUAL).pdf ; then \
+	    $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
+	  fi ; \
+	  if test -d $(HTMLDIR) ; then \
+	  HTMLGENDIR="$(HTMLDIR)" ; \
+	  elif test -d $(srcdir)/$(HTMLDIR) ; then \
+	    HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
+	  else \
+	    exit 1 ; \
+	  fi ; \
+	  for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
+	    if test -f $$file ; then \
+	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
+	    fi ; \
+	  done ; \
+	  for file in $(srcdir)/figures/*.png ; do \
+	    if test -f $$file ; then \
+	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
+	    fi ; \
+	  done ; \
+	  if test -d $$HTMLGENDIR/stylesheet-images ; then \
+	    for file in $$HTMLGENDIR/stylesheet-images/* ; do \
+	      if test -f $$file ; then \
+	        $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
+	      fi ; \
+	    done ; \
+	  fi ; \
+	fi
+
+uninstall-local:
+	-$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+
+CLEAN_MANUALS = \
+	$(RM) -f $(MANUAL).pdf $(MANUAL).ps ;	\
+	$(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ;	\
+	$(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ;	\
+	$(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ;	\
+	$(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ;	\
+	$(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
+
+clean-local:
+	if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
+	  echo "clean-local: Not removing $(HTMLDIR)" ; \
+	  echo 'clean-local: Not removing $(MANUAL).pdf' ; \
+	  echo 'clean-local: Not removing $(MANUAL).ps' ; \
+	  echo 'clean-local: Not removing EPS figures' ; \
+	else \
+	  $(CLEAN_MANUALS) ; \
+	fi
+	if test $(srcdir) = "." ; then \
+	  : ; \
+	else \
+	  $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
+	  $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
+	  $(RM) -rf figures ; \
+	fi
+	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
+	-$(RM) -rf db2html* DB2HTML*
+
+veryclean:
+	$(MAKE) MAINT_MODE=true clean
+
+maintainer-clean-local:
+	$(CLEAN_MANUALS)
+
+#
+# This is my (so far failed) attempt to create an index for this documentation.
+#
+#
+#index.sgml:
+#	$(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
+#
+#	$(JADE)	-V html-index \
+#		-t sgml \
+#		-c /usr/share/sgml/CATALOG.jade_dsl \
+#		-c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
+#		-c /usr/share/sgml/CATALOG.gnome \
+#		-c /usr/share/sgml/CATALOG.docbook_4 \
+#		-c /usr/share/sgml/CATALOG.docbook_3  \
+#		-D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
+#		-d /usr/share/sgml/docbook-toys/suse-both.dsl \
+#		-o index.sgml \
+#		gimp-print-users-guide-4.1.99-b3.sgml
+#
+#
+# END failed attempt at index creation.
+#
+
+help:
+	@echo "  "
+	@echo "Targets for the complete user's guide:"
+	@echo "  "
+	@echo "    docs      - creates PS, PDF, and HTML documentation files"
+	@echo "    all_docs  - creates PS and HTML documentation files"
+	@echo "    ps        - creates PostScript documentation"
+	@echo "    pdf       - creates PDF documentation"
+	@echo "    html      - creates HTML documentation"
+	@echo "    clean     - deletes machine generated files, but not outputs"
+	@echo "    veryclean - deletes output files in addition"
+	@echo "    help      - prints this help text"
+	@echo ""
+	@echo "Targets for specific manual editions:"
+	@echo "  "
+	@echo "    cups_html - generate HTML for CUPS edition of the manual"
+	@echo "    cups_pdf  - generate PDF for CUPS edition of the manual"
+	@echo "    cups_ps   - generate PS for CUPS edition of the manual"
+	@echo "  "
+	@echo "    gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
+	@echo "    gimp_html - generate HTML for GIMP edition of the manual"
+	@echo "    gimp_pdf  - generate PDF for GIMP edition of the manual"
+	@echo "    gimp_ps   - generate PS for GIMP edition of the manual"
+	@echo "  "
+	@echo "    util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
+	@echo "    util_html - generate HTML for UTIL edition of the manual"
+	@echo "    util_pdf  - generate PDF for UTIL edition of the manual"
+	@echo "    util_ps   - generate PS for UTIL edition of the manual"
+	@echo "  "
+	@echo "    editions  - generates HTML, PDF, and PS for ALL editions of the manual"
+	@echo "  "
+
+
+## Clean
+
+MAINTAINERCLEANFILES = Makefile.in *html-stamp
+
+
+EXTRA_DIST = README				\
+	$(MANUAL_SRC_FILES)			\
+	html-stamp				\
+	cups-edition.sgml			\
+	gimp-edition.sgml			\
+	util-edition.sgml
+
+.PHONY: docs cups_docs gimp_docs util_docs
+.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
+.PHONY: html cups_html gimp_html util_html
+.PHONY: ps cups_ps gimp_ps util_ps
+.PHONY: pdf cups_pdf gimp_pdf util_pdf
+.PHONY: help
diff --git a/doc/users_guide/Makefile.in b/doc/users_guide/Makefile.in
new file mode 100644
index 0000000..fedd86c
--- /dev/null
+++ b/doc/users_guide/Makefile.in
@@ -0,0 +1,980 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#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
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = doc/users_guide
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+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_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_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@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+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@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL = @GIMPTOOL@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GIMPTOOL_CHECK = @GIMPTOOL_CHECK@
+GIMP_CFLAGS = @GIMP_CFLAGS@
+GIMP_CFLAGS_NOUI = @GIMP_CFLAGS_NOUI@
+GIMP_DATA_DIR = @GIMP_DATA_DIR@
+GIMP_LIBS = @GIMP_LIBS@
+GIMP_LIBS_NOUI = @GIMP_LIBS_NOUI@
+GIMP_PLUGIN_DIR = @GIMP_PLUGIN_DIR@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_CONFIG = @GLIB_CONFIG@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GNUCFLAGS = @GNUCFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINTUI_BINARY_AGE = @GUTENPRINTUI_BINARY_AGE@
+GUTENPRINTUI_CFLAGS = @GUTENPRINTUI_CFLAGS@
+GUTENPRINTUI_CURRENT_INTERFACE = @GUTENPRINTUI_CURRENT_INTERFACE@
+GUTENPRINTUI_INTERFACE_AGE = @GUTENPRINTUI_INTERFACE_AGE@
+GUTENPRINTUI_LIBDEPS = @GUTENPRINTUI_LIBDEPS@
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+GUTENPRINTUI_VERSION = @GUTENPRINTUI_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+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@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEXI2HTML = @TEXI2HTML@
+USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
+USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_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@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gimp_plug_indir = @gimp_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
+gutenprintui_libs = @gutenprintui_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+EPSLEVEL = 2
+UTIL_MANUAL = util-edition
+UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/utils.sgml \
+	$(srcdir)/gfdl.sgml
+
+GIMP_MANUAL = gimp-edition
+GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/gimp.sgml \
+	$(srcdir)/gfdl.sgml
+
+CUPS_MANUAL = cups-edition
+CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/cups.sgml \
+	$(srcdir)/gfdl.sgml
+
+MANUAL = users-guide
+MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
+	$(srcdir)/title.sgml \
+	$(srcdir)/history.sgml \
+	$(srcdir)/gimp.sgml \
+	$(srcdir)/cups.sgml \
+	$(srcdir)/utils.sgml \
+	$(srcdir)/gfdl.sgml
+
+UTIL_HTMLDIR = util_html
+GIMP_HTMLDIR = gimp_html
+CUPS_HTMLDIR = cups_html
+HTMLDIR = html
+UTIL_OUTPUTS = \
+ $(UTIL_MANUAL).pdf \
+ util_html
+
+GIMP_OUTPUTS = \
+ $(GIMP_MANUAL).pdf \
+ gimp_html
+
+CUPS_OUTPUTS = \
+ $(CUPS_MANUAL).pdf \
+ cups_html
+
+OUTPUTS = \
+ $(MANUAL).pdf \
+ html
+
+UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
+GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
+CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
+USER_GUIDE = $(MANUAL).pdf html
+@INSTALL_USER_GUIDE_TRUE@STANDARD_TARGETS = $(USER_GUIDE)
+DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
+UTIL_PNG_IMAGES = 
+CUPS_PNG_IMAGES = \
+	figures/cups_admin.png				\
+	figures/cups_admin_device.png			\
+	figures/cups_admin_make.png			\
+	figures/cups_admin_model.png			\
+	figures/cups_admin_success.png			\
+	figures/cups_config_printer.png			\
+	figures/cups_my_printer.png			\
+	figures/cups_printers.png			\
+	figures/cups_startup.png
+
+GIMP_PNG_IMAGES = \
+	figures/gimp-print-gui-1.png			\
+	figures/gimp-print-gui.png			\
+	figures/gimp-print-new-printer.png		\
+	figures/gimp-print-print-color-adjust.png	\
+	figures/gimp-print-setup.png			\
+	figures/gimp_image.png				\
+	figures/gimp_startup.png
+
+PNG_IMAGES = \
+	$(CUPS_PNG_IMAGES) 				\
+	$(GIMP_PNG_IMAGES)
+
+DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
+UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
+GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
+CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
+EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
+@MAINTAINER_MODE_FALSE@MAINT_MODE = false
+@MAINTAINER_MODE_TRUE@MAINT_MODE = true
+@MAINTAINER_MODE_FALSE@ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
+@MAINTAINER_MODE_TRUE@ALL_LOCAL_TARGETS = docs
+CLEAN_MANUALS = \
+	$(RM) -f $(MANUAL).pdf $(MANUAL).ps ;	\
+	$(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ;	\
+	$(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ;	\
+	$(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ;	\
+	$(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ;	\
+	$(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
+
+MAINTAINERCLEANFILES = Makefile.in *html-stamp
+EXTRA_DIST = README				\
+	$(MANUAL_SRC_FILES)			\
+	html-stamp				\
+	cups-edition.sgml			\
+	gimp-edition.sgml			\
+	util-edition.sgml
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/users_guide/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  --ignore-deps doc/users_guide/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/$(srcdir) $(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; \
+	  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 \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf-am:
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-local
+
+.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
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+dist-hook: $(USER_GUIDE)
+	for file in $(DISTHOOKFILES) ; do \
+	  if test -f $$file ; then \
+            if ! test -d $(distdir)/`dirname $$file` ; then \
+	      mkdir $(distdir)/`dirname $$file` ; \
+	    fi ; \
+	    cp -p $$file $(distdir)/`dirname $$file` ; \
+	  fi ; \
+	done
+	for dir in $(DISTHOOKDIRS) ; do \
+	  if test -d $(srcdir)/$$dir ; then \
+	    mkdir $(distdir)/$$dir; \
+	    for dirfile in $(srcdir)/$$dir/*; do \
+	      if test -f $$dirfile ; then \
+	        cp -p $$dirfile $(distdir)/$$dir ; \
+	      fi ; \
+	      if test -d $$dirfile ; then \
+	        cp -pR $$dirfile $(distdir)/$$dir ; \
+	      fi ; \
+	    done \
+	  fi \
+	done
+
+$(UTIL_MANUAL).pdf:  $(UTIL_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	fi ; \
+	$(DB2PDF) $(UTIL_MANUAL).sgml
+
+$(GIMP_MANUAL).pdf:  $(GIMP_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(GIMP_MANUAL).sgml
+
+$(CUPS_MANUAL).pdf:  $(CUPS_MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(CUPS_MANUAL).sgml
+
+$(MANUAL).pdf:  $(MANUAL_SRC_FILES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
+	  if test -d figures ; then \
+	    : ; \
+	  else \
+	    mkdir figures ; \
+	  fi ; \
+	  for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
+	    cp -p $$image figures/`basename $$image` ; \
+	  done ; \
+	fi ; \
+	$(DB2PDF) $(MANUAL).sgml
+
+editions:  docs cups_docs gimp_docs util_docs
+
+util_docs: util_html util_pdf
+gimp_docs: gimp_html gimp_pdf
+cups_docs: cups_html cups_pdf
+docs: html pdf
+
+all_util_docs: util_html util_ps util_pdf
+all_gimp_docs: gimp_html gimp_ps gimp_pdf
+all_cups_docs: cups_html cups_ps cups_pdf
+all_docs: html ps pdf
+
+all-local: $(ALL_LOCAL_TARGETS)
+
+util_pdf: $(UTIL_MANUAL).pdf
+gimp_pdf: $(GIMP_MANUAL).pdf
+cups_pdf: $(CUPS_MANUAL).pdf
+pdf: $(MANUAL).pdf
+
+util_ps: $(UTIL_MANUAL).ps
+gimp_ps: $(GIMP_MANUAL).ps
+cups_ps: $(CUPS_MANUAL).ps
+ps: $(MANUAL).ps
+
+$(UTIL_MANUAL).ps:  $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
+	for i in $(UTIL_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
+	$(DB2PS) $(UTIL_MANUAL)-eps.sgml
+	mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
+	for i in $(UTIL_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(GIMP_MANUAL).ps:  $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
+	for i in $(GIMP_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
+	$(DB2PS) $(GIMP_MANUAL)-eps.sgml
+	mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
+	for i in $(GIMP_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(CUPS_MANUAL).ps:  $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
+	for i in $(CUPS_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
+	$(DB2PS) $(CUPS_MANUAL)-eps.sgml
+	mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
+	for i in $(CUPS_MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+$(MANUAL).ps:  $(MANUAL_SRC_FILES) $(EPS_IMAGES)
+	for i in $(MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		sed -e 's/\.png"/.eps"/g' \
+		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
+	done
+	cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
+	$(DB2PS) $(MANUAL)-eps.sgml
+	mv $(MANUAL)-eps.ps $(MANUAL).ps
+	for i in $(MANUAL_SRC_FILES); do \
+		j=`basename $$i .sgml`; \
+		$(RM) -f $${j}-eps.*; \
+	done
+
+%.eps:
+	if test ! -d figures ; then mkdir figures ; fi
+	$(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
+
+util_html: util-html-stamp
+gimp_html: gimp-html-stamp
+cups_html: cups-html-stamp
+html: html-stamp
+
+# This ugly workaround with SOURCE is because db2html doesn't seem to like
+# "./users-guide.sgml".  Note that db2ps does not have the same limitation.
+# html-stamp should *only* be called by html--it's just a timestamp!
+
+util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(UTIL_MANUAL).sgml
+	-$(RM) -rf $(UTIL_HTMLDIR)
+	mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
+	chmod a+rx $(UTIL_HTMLDIR)
+	touch util-html-stamp
+
+gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(GIMP_MANUAL).sgml
+	-mkdir $(GIMP_MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
+	  cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(GIMP_HTMLDIR)
+	mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
+	chmod a+rx $(GIMP_HTMLDIR)
+	touch gimp-html-stamp
+
+cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(CUPS_MANUAL).sgml
+	-mkdir $(CUPS_MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
+	  cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(CUPS_HTMLDIR)
+	mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
+	chmod a+rx $(CUPS_HTMLDIR)
+	touch cups-html-stamp
+
+html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
+	if test $(srcdir) = '.' ; then \
+	  : ; \
+	else \
+	  if test -L $(notdir $<) ; then \
+	    $(RM) $(notdir $<) ; \
+	  fi ; \
+	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
+	fi
+	$(DB2HTML) $(MANUAL).sgml
+	-mkdir $(MANUAL)/figures
+	for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
+	  cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
+	done
+	-$(RM) -rf $(HTMLDIR)
+	mv $(MANUAL) $(HTMLDIR)
+	chmod a+rx $(HTMLDIR)
+	touch html-stamp
+
+install-data-local: $(STANDARD_TARGETS)
+	if test -n '$(STANDARD_TARGETS)' ; then \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
+	  if test -f $(MANUAL).pdf ; then \
+	    $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
+	  elif test -f $(srcdir)/$(MANUAL).pdf ; then \
+	    $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
+	  fi ; \
+	  if test -d $(HTMLDIR) ; then \
+	  HTMLGENDIR="$(HTMLDIR)" ; \
+	  elif test -d $(srcdir)/$(HTMLDIR) ; then \
+	    HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
+	  else \
+	    exit 1 ; \
+	  fi ; \
+	  for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
+	    if test -f $$file ; then \
+	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
+	    fi ; \
+	  done ; \
+	  for file in $(srcdir)/figures/*.png ; do \
+	    if test -f $$file ; then \
+	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
+	    fi ; \
+	  done ; \
+	  if test -d $$HTMLGENDIR/stylesheet-images ; then \
+	    for file in $$HTMLGENDIR/stylesheet-images/* ; do \
+	      if test -f $$file ; then \
+	        $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
+	      fi ; \
+	    done ; \
+	  fi ; \
+	fi
+
+uninstall-local:
+	-$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+
+clean-local:
+	if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
+	  echo "clean-local: Not removing $(HTMLDIR)" ; \
+	  echo 'clean-local: Not removing $(MANUAL).pdf' ; \
+	  echo 'clean-local: Not removing $(MANUAL).ps' ; \
+	  echo 'clean-local: Not removing EPS figures' ; \
+	else \
+	  $(CLEAN_MANUALS) ; \
+	fi
+	if test $(srcdir) = "." ; then \
+	  : ; \
+	else \
+	  $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
+	  $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
+	  $(RM) -rf figures ; \
+	fi
+	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
+	-$(RM) -rf db2html* DB2HTML*
+
+veryclean:
+	$(MAKE) MAINT_MODE=true clean
+
+maintainer-clean-local:
+	$(CLEAN_MANUALS)
+
+#
+# This is my (so far failed) attempt to create an index for this documentation.
+#
+#
+#index.sgml:
+#	$(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
+#
+#	$(JADE)	-V html-index \
+#		-t sgml \
+#		-c /usr/share/sgml/CATALOG.jade_dsl \
+#		-c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
+#		-c /usr/share/sgml/CATALOG.gnome \
+#		-c /usr/share/sgml/CATALOG.docbook_4 \
+#		-c /usr/share/sgml/CATALOG.docbook_3  \
+#		-D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
+#		-d /usr/share/sgml/docbook-toys/suse-both.dsl \
+#		-o index.sgml \
+#		gimp-print-users-guide-4.1.99-b3.sgml
+#
+#
+# END failed attempt at index creation.
+#
+
+help:
+	@echo "  "
+	@echo "Targets for the complete user's guide:"
+	@echo "  "
+	@echo "    docs      - creates PS, PDF, and HTML documentation files"
+	@echo "    all_docs  - creates PS and HTML documentation files"
+	@echo "    ps        - creates PostScript documentation"
+	@echo "    pdf       - creates PDF documentation"
+	@echo "    html      - creates HTML documentation"
+	@echo "    clean     - deletes machine generated files, but not outputs"
+	@echo "    veryclean - deletes output files in addition"
+	@echo "    help      - prints this help text"
+	@echo ""
+	@echo "Targets for specific manual editions:"
+	@echo "  "
+	@echo "    cups_html - generate HTML for CUPS edition of the manual"
+	@echo "    cups_pdf  - generate PDF for CUPS edition of the manual"
+	@echo "    cups_ps   - generate PS for CUPS edition of the manual"
+	@echo "  "
+	@echo "    gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
+	@echo "    gimp_html - generate HTML for GIMP edition of the manual"
+	@echo "    gimp_pdf  - generate PDF for GIMP edition of the manual"
+	@echo "    gimp_ps   - generate PS for GIMP edition of the manual"
+	@echo "  "
+	@echo "    util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
+	@echo "    util_html - generate HTML for UTIL edition of the manual"
+	@echo "    util_pdf  - generate PDF for UTIL edition of the manual"
+	@echo "    util_ps   - generate PS for UTIL edition of the manual"
+	@echo "  "
+	@echo "    editions  - generates HTML, PDF, and PS for ALL editions of the manual"
+	@echo "  "
+
+.PHONY: docs cups_docs gimp_docs util_docs
+.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
+.PHONY: html cups_html gimp_html util_html
+.PHONY: ps cups_ps gimp_ps util_ps
+.PHONY: pdf cups_pdf gimp_pdf util_pdf
+.PHONY: help
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/users_guide/README b/doc/users_guide/README
new file mode 100644
index 0000000..c6f1025
--- /dev/null
+++ b/doc/users_guide/README
@@ -0,0 +1,39 @@
+
+The files contained in this directory are all of the source files necessary
+to build "The User's Guide to the Gutenprint Top Quality Printer Drivers".
+
+Type:  make pdf   - to build the PDF documentation file
+       make ps    - to build the Postscript documentation file
+       make html  - to build the HTML documentation files
+       make docs  - to build all of the documentation files
+
+This is what will be generated:
+
+	users_guide.ps
+	users_guide.pdf
+	html/book1.html
+
+While building the documentation, you will see messages from LaTeX regarding
+undefined references.  These can also be safely ignored.
+
+The documentation contains many color screenshots.  My goal was to have the
+documentation print acceptably at 360 DPI.  However, I realize that not everybody
+has a color printer.  For those people, such as the owners of laser printers,
+I'd like to suggest printing the documentation in greyscale.  Printing the
+documentation in black and white will results in unacceptable quality for many
+of the screenshots.
+
+All of the figures are contained in the "figures" subdirectory.  Read the
+figures/README file if you are interested in how I created the
+screenshots used throughout the documentation.
+
+All of the HTML files are contained in the "html" subdirectory.
+
+Your constructive feedback is most welcome.
+
+Andy Stewart
+13-oct-2001
+
+
+
+
diff --git a/doc/users_guide/cups-edition.sgml b/doc/users_guide/cups-edition.sgml
new file mode 100644
index 0000000..2056bbf
--- /dev/null
+++ b/doc/users_guide/cups-edition.sgml
@@ -0,0 +1,58 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY title   SYSTEM "title.sgml">
+<!ENTITY history SYSTEM "history.sgml">
+<!ENTITY gimp    SYSTEM "gimp.sgml">
+<!ENTITY cups    SYSTEM "cups.sgml">
+<!ENTITY utils   SYSTEM "utils.sgml">
+<!ENTITY gfdl    SYSTEM "gfdl.sgml">
+]>
+<book>
+
+ <bookinfo>
+  <title>The User's Guide to the Gutenprint - CUPS Edition</title>
+  <date>April 7, 2002</date>
+  <pubdate>April 7, 2002</pubdate>
+  <author>
+    <firstname>Andy</firstname>
+    <surname>Stewart</surname>
+  </author>
+  <copyright>
+    <year>2002</year>
+    <holder>Andy Stewart</holder>
+  </copyright>
+  <legalnotice>
+    <para>The User's Guide to the Gutenprint - CUPS Edition, Copyright
+2002, Andy Stewart.
+    </para>
+
+&title;
+
+<chapter><title>CUPS Edition</title>
+
+  <caution><title>PLEASE NOTE</title>
+
+    <para>
+    This manual includes a subset of chapters from a more complete
+manual entitled <emphasis>The User's Guide to the Gutenprint Top
+Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
+to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
+Project</ulink> home page.
+    </para>
+    <para>
+    This version of the manual has been specifically packaged in this
+way in an attempt to better suit the needs of people interested only
+in using the Gutenprint software with 
+<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing System).
+    </para>
+
+  </caution>
+
+</chapter>
+
+&history;
+&cups;
+&gfdl;
+</book>
+
+
+
diff --git a/doc/users_guide/cups.sgml b/doc/users_guide/cups.sgml
new file mode 100644
index 0000000..c39506f
--- /dev/null
+++ b/doc/users_guide/cups.sgml
@@ -0,0 +1,320 @@
+
+ <chapter><title>CUPS and Gutenprint</title>
+   <sect1><title>Introduction</title>
+     <para>
+       CUPS is an acronym which stands for <emphasis>C</emphasis>ommon
+<emphasis>U</emphasis>nix <emphasis>P</emphasis>rinting
+<emphasis>S</emphasis>ystem.  It is assumed that the reader has
+properly installed the CUPS software and the Gutenprint software.
+This section will discuss adding a printer to CUPS that uses a
+Gutenprint printer driver, as well as how to modify the various
+settings supplied by Gutenprint. This will be a rather quick
+explanation, as the CUPS software is quite well documented, and it is
+not my intention to attempt to duplicate the CUPS documentation here.
+     </para>
+   </sect1>
+
+   <sect1><title>CUPS Printer Installation</title>
+     <para>
+This explanation will use the web interface provided by CUPS. First,
+aim your favorite web browser at
+<ulink url="http://localhost:631">the CUPS server</ulink>.  The
+following screen should appear within your browser.
+    </para>
+
+   <figure><title>The CUPS Startup Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="45" fileref="figures/cups_startup.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Startup Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <para>
+Now, you may click on either the word <guilabel>Printers</guilabel> in the bar at the top
+of the page, or you may click on the <guilabel>Manage Printers</guilabel> text.  In
+either case, the next screen you see will look like this one if you
+have not yet configured any printers.
+   </para>
+
+   <figure><title>The CUPS Printers Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="45" fileref="figures/cups_printers.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Printers Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+    <para>
+At this time, click on the <guibutton>Add Printer</guibutton> button.
+You will then see the Admin screen (shown below).
+    </para>
+
+   <figure><title>The CUPS Admin Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="45" fileref="figures/cups_admin.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Admin Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <para>
+Notice in the screenshot that the three boxes are shown after the
+author filled them in for his printer at home.  You will need to fill
+in an appropriate name of your printer, its location, and a
+description which meets your own needs.  Once this is done, click on
+the <guibutton>Continue</guibutton> button, and then this screen will appear.
+   </para>
+
+   <figure id="fig-cups-admin-device"><title>The CUPS Admin Device Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="35" fileref="figures/cups_admin_device.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Admin Device Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <para>
+Click on the drop down menu next to the word
+<guilabel>Device</guilabel> and a list of possible printer devices
+appears.  Select the device appropriate for your printer.  Note that
+there are a range of serial, parallel, USB, and other devices from
+which to choose.  Once the selection is made, click the
+<guibutton>Continue</guibutton> button.  Now, this screen appears.
+   </para>
+
+   <figure><title>The CUPS Admin Model/Driver Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="35" fileref="figures/cups_admin_make.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Admin Model/Driver Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <caution>
+   <title>Caution Regarding USB Printers</title>
+
+   <para>
+CUPS versions 1.1.11 and later <emphasis>REQUIRE</emphasis>
+the user to insure that the desired USB printer is powered on
+<emphasis>AND</emphasis> physically connected to the USB bus
+<emphasis>BEFORE</emphasis> starting the CUPS software.  
+   </para>
+   <para>
+CUPS must see the USB printer when the software starts.  The CUPS software
+is typically started when the computer boots.  Note that one cannot
+simply plug in the USB printer and power it on after CUPS has started.
+(Note that this does not apply to parallel port printers).
+   </para>
+   <para>
+If the USB printer was not connected and powered on at the time CUPS was
+started, there will not be a USB printer shown in the
+list of devices on the CUPS Admin Device Window (see 
+<xref linkend="fig-cups-admin-device">).  In this event, stop the CUPS
+software, properly connect and power on the USB printer, and restart
+the CUPS software.
+   </para>
+   <para>
+From the list of devices shown in the CUPS Admin Device Window
+(see <xref linkend="fig-cups-admin-device">), a clever user might
+attempt to avoid this issue by selecting 
+<guimenuitem>Internet Printing Protocol</guimenuitem> 
+and then enter something similar to 'usb:/dev/usblp0' in the next
+screen.  However, this fails later in the configuration process with a
+"client_error_not_possible" error message with no other explanation.
+Note that entering 'file:/dev/usblp0' will not work either. While CUPS
+will allow this, printing will not actually work in some situations.
+   </para>
+   <para>
+CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
+to not displaying the USB printer if it was not connected to the USB
+bus and powered up prior to starting the CUPS software.  However,
+these versions of CUPS will indeed allow the user to enter the name of
+the USB connection, unlike versions 1.1.11 and later.
+   </para>
+   </caution>
+
+   <para>
+Select the manufacturer of your printer and click the
+<guibutton>Continue</guibutton> button.  A window will appear which
+asks you to select the specific model number for your printer.
+   </para>
+
+   <para>
+Scroll through the long list and find the model number for your
+printer.  Notice carefully that there are many different languages
+supported for each printer, as denoted by the initials in parenthesis.
+(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
+French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
+English (see <xref linkend="fig-cups-admin-model">).  Also take note
+of the Gutenprint revision for the driver, and ensure that it is
+indeed the version of Gutenprint which you have most recently
+installed.  Once you have made the proper selection, click on the
+<guibutton>Continue</guibutton> button. 
+   </para>
+
+   <figure id="fig-cups-admin-model"><title>The 2nd CUPS Admin Model/Driver Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="55" fileref="figures/cups_admin_model.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The 2nd CUPS Admin Model/Driver Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <figure><title>The CUPS Admin Success Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="39" fileref="figures/cups_admin_success.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Admin Success Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <para>
+Congratulations!  You should now see the CUPS window indicating that
+your printer was successfully installed.  Notice the sentence which
+reads "Printer your_printer has been added successfully".  Click on
+your_printer, which will be the underlined name for your printer.
+   </para>
+
+   <figure id="fig-cups-my-printer"><title>The CUPS Window for Your Printer</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="65" fileref="figures/cups_my_printer.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Window for Your Printer</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <para>
+After clicking on your_printer (epson_870 in this example), a window
+will appear similar to that shown in <xref linkend="fig-cups-my-printer">.
+It would probably be a good idea at this point to click on the
+<guibutton>Print Test Page</guibutton> button to ensure that
+everything is working properly.  Take note of the Gutenprint revision
+printed on this screen and confirm once again that it is the expected
+revision.
+   </para>
+
+   </sect1>
+
+   <sect1><title>Configuring your Printer in CUPS</title>
+
+     <para>
+With reference to <xref linkend="fig-cups-my-printer">, click
+on the <guibutton>Configure Printer</guibutton> button.  A partial
+screenshot of the printer configuration window appears in
+<xref linkend="fig-cups-printer-config-window">.
+The contents of this window will vary depending on precisely which
+printer you selected when you configured CUPS for your printer.  The
+screenshot shows the selections made by the author for his printer.
+The individual selections will not be explained in detail here, as
+they are the same selections which are available when using the
+Gutenprint plugin to the GIMP.  These selections are explained in
+detail in various sections of the <emphasis>GIMP and
+Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
+Gutenprint Top Quality Printer Drivers</emphasis>.
+   </para>
+
+   <figure id="fig-cups-printer-config-window"><title>The CUPS Printer Cofiguration Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="30" fileref="figures/cups_config_printer.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The CUPS Printer Configuration Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+
+   </sect1>
+
+   <sect1><title>Using CUPS from the Command Line</title>
+
+   <para>
+    It is possible to use the CUPS printing system from the command
+line.  While this document will not delve into all of the specifics of
+the CUPS command line interface, there are portions of this interface
+which are specific to the Gutenprint software.
+   </para>
+
+   <para>
+The command line is in some cases a more convenient way to generate
+printed output (e.g. when printing from a script).  However, most
+people (including the author) cannot easily predict what a command
+line option of "-o stpCyan=1350" will do to the output.  It is
+therefore a good idea to use the GIMP to view the image and the
+Gutenprint plugin to preview these settings before relying on the
+command line.
+   </para>
+
+   <para>
+When using CUPS from the command line, the command will have this
+general format:
+
+   <programlisting>
+   <![ CDATA [
+     lpr -P my_printer_name \
+         -o option1=<choice1> \
+         -o option2=<choice2> \
+         /path/to/printfile
+     ]]>
+   </programlisting>
+
+When typing the command directly onto the command line, put all of the
+command line options on one line, and do not type the "\" characters.
+The list of possible options which are specific to Gutenprint,
+followed by some of the supported choices, are shown below:
+
+   <programlisting>
+   <![ CDATA [
+   -o PageSize=<...| A3 | A4 | A4 | ...>
+   -o InputSlot=<Roll | Standard>
+   -o MediaType=< ..| Inkjet | Plain | GlossyPaper | ...>
+   -o Resolution=<360sw | 360swuni ...| 1440x720 >
+   -o ColorModel=<Black | RGB | Gray | CMYK>
+   -o stpBrightness=<0...2000>
+   -o stpContrast=<0...2000>
+   -o stpCyan=<0...4000>
+   -o stpDensity=<0...2000>
+   -o stpDither=<0...4000>
+   -o stpGamma=<0...4000>
+   -o stpImageType=<LineArt | Continuous | SolidTone>
+   -o stpInkType=<PhotoCMY | CMYK | PhotoCMYK | RGB>
+   -o stpMagenta=<0...4000>
+   -o stpSaturation=<0...9000>
+   -o stpYellow=<0...4000>
+   ]]>
+   </programlisting>
+
+For more detailed information, consult the appropriate sections of the <emphasis>GIMP and
+Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
+Gutenprint Top Quality Printer Drivers</emphasis>.
+   </para>
+
+   </sect1>
+
+ </chapter>
diff --git a/doc/users_guide/figures/cups_admin.png b/doc/users_guide/figures/cups_admin.png
new file mode 100644
index 0000000..464fcc4
--- /dev/null
+++ b/doc/users_guide/figures/cups_admin.png
diff --git a/doc/users_guide/figures/cups_admin_device.png b/doc/users_guide/figures/cups_admin_device.png
new file mode 100644
index 0000000..b258263
--- /dev/null
+++ b/doc/users_guide/figures/cups_admin_device.png
diff --git a/doc/users_guide/figures/cups_admin_make.png b/doc/users_guide/figures/cups_admin_make.png
new file mode 100644
index 0000000..1948ba7
--- /dev/null
+++ b/doc/users_guide/figures/cups_admin_make.png
diff --git a/doc/users_guide/figures/cups_admin_model.png b/doc/users_guide/figures/cups_admin_model.png
new file mode 100644
index 0000000..b476a75
--- /dev/null
+++ b/doc/users_guide/figures/cups_admin_model.png
diff --git a/doc/users_guide/figures/cups_admin_success.png b/doc/users_guide/figures/cups_admin_success.png
new file mode 100644
index 0000000..edebafe
--- /dev/null
+++ b/doc/users_guide/figures/cups_admin_success.png
diff --git a/doc/users_guide/figures/cups_config_printer.png b/doc/users_guide/figures/cups_config_printer.png
new file mode 100644
index 0000000..1f980dc
--- /dev/null
+++ b/doc/users_guide/figures/cups_config_printer.png
diff --git a/doc/users_guide/figures/cups_my_printer.png b/doc/users_guide/figures/cups_my_printer.png
new file mode 100644
index 0000000..d8441c8
--- /dev/null
+++ b/doc/users_guide/figures/cups_my_printer.png
diff --git a/doc/users_guide/figures/cups_printers.png b/doc/users_guide/figures/cups_printers.png
new file mode 100644
index 0000000..4d45d1c
--- /dev/null
+++ b/doc/users_guide/figures/cups_printers.png
diff --git a/doc/users_guide/figures/cups_startup.png b/doc/users_guide/figures/cups_startup.png
new file mode 100644
index 0000000..22d01d0
--- /dev/null
+++ b/doc/users_guide/figures/cups_startup.png
diff --git a/doc/users_guide/figures/gimp-print-gui-1.png b/doc/users_guide/figures/gimp-print-gui-1.png
new file mode 100644
index 0000000..1c083bb
--- /dev/null
+++ b/doc/users_guide/figures/gimp-print-gui-1.png
diff --git a/doc/users_guide/figures/gimp-print-gui.png b/doc/users_guide/figures/gimp-print-gui.png
new file mode 100644
index 0000000..a9739fb
--- /dev/null
+++ b/doc/users_guide/figures/gimp-print-gui.png
diff --git a/doc/users_guide/figures/gimp-print-new-printer.png b/doc/users_guide/figures/gimp-print-new-printer.png
new file mode 100644
index 0000000..39dd681
--- /dev/null
+++ b/doc/users_guide/figures/gimp-print-new-printer.png
diff --git a/doc/users_guide/figures/gimp-print-print-color-adjust.png b/doc/users_guide/figures/gimp-print-print-color-adjust.png
new file mode 100644
index 0000000..5ab1a33
--- /dev/null
+++ b/doc/users_guide/figures/gimp-print-print-color-adjust.png
diff --git a/doc/users_guide/figures/gimp-print-setup.png b/doc/users_guide/figures/gimp-print-setup.png
new file mode 100644
index 0000000..e406c0b
--- /dev/null
+++ b/doc/users_guide/figures/gimp-print-setup.png
diff --git a/doc/users_guide/figures/gimp_image.png b/doc/users_guide/figures/gimp_image.png
new file mode 100644
index 0000000..9193558
--- /dev/null
+++ b/doc/users_guide/figures/gimp_image.png
diff --git a/doc/users_guide/figures/gimp_startup.png b/doc/users_guide/figures/gimp_startup.png
new file mode 100644
index 0000000..b6335e1
--- /dev/null
+++ b/doc/users_guide/figures/gimp_startup.png
diff --git a/doc/users_guide/gfdl.sgml b/doc/users_guide/gfdl.sgml
new file mode 100644
index 0000000..6db9fbe
--- /dev/null
+++ b/doc/users_guide/gfdl.sgml
@@ -0,0 +1,466 @@
+<appendix id="gfdl">
+<title>GNU Free Documentation License</title>
+<!-- - GNU Project - Free Software Foundation (FSF) -->
+<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
+
+
+  <!-- sect1>
+    <title>GNU Free Documentation License</title -->
+
+    <para>Version 1.1, March 2000</para>
+
+    <blockquote>
+      <para>Copyright (C) 2000  Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.</para>
+    </blockquote>
+
+  <sect1 label="0">
+    <title>PREAMBLE</title>
+
+    <para>The purpose of this License is to make a manual, textbook,
+    or other written document "free" in the sense of freedom: to
+    assure everyone the effective freedom to copy and redistribute it,
+    with or without modifying it, either commercially or
+    noncommercially.  Secondarily, this License preserves for the
+    author and publisher a way to get credit for their work, while not
+    being considered responsible for modifications made by
+    others.</para>
+
+    <para>This License is a kind of "copyleft", which means that
+    derivative works of the document must themselves be free in the
+    same sense.  It complements the GNU General Public License, which
+    is a copyleft license designed for free software.</para>
+
+    <para>We have designed this License in order to use it for manuals
+    for free software, because free software needs free documentation:
+    a free program should come with manuals providing the same
+    freedoms that the software does.  But this License is not limited
+    to software manuals; it can be used for any textual work,
+    regardless of subject matter or whether it is published as a
+    printed book.  We recommend this License principally for works
+    whose purpose is instruction or reference.</para>
+  </sect1>
+
+  <sect1 label="1">
+    <title>APPLICABILITY AND DEFINITIONS</title>
+
+    <para>This License applies to any manual or other work that
+    contains a notice placed by the copyright holder saying it can be
+    distributed under the terms of this License.  The "Document",
+    below, refers to any such manual or work.  Any member of the
+    public is a licensee, and is addressed as "you".</para>
+
+    <para>A "Modified Version" of the Document means any work
+    containing the Document or a portion of it, either copied
+    verbatim, or with modifications and/or translated into another
+    language.</para>
+
+    <para>A "Secondary Section" is a named appendix or a front-matter
+    section of the Document that deals exclusively with the
+    relationship of the publishers or authors of the Document to the
+    Document's overall subject (or to related matters) and contains
+    nothing that could fall directly within that overall subject.
+    (For example, if the Document is in part a textbook of
+    mathematics, a Secondary Section may not explain any mathematics.)
+    The relationship could be a matter of historical connection with
+    the subject or with related matters, or of legal, commercial,
+    philosophical, ethical or political position regarding
+    them.</para>
+
+    <para>The "Invariant Sections" are certain Secondary Sections
+    whose titles are designated, as being those of Invariant Sections,
+    in the notice that says that the Document is released under this
+    License.</para>
+
+    <para>The "Cover Texts" are certain short passages of text that
+    are listed, as Front-Cover Texts or Back-Cover Texts, in the
+    notice that says that the Document is released under this
+    License.</para>
+
+    <para>A "Transparent" copy of the Document means a
+    machine-readable copy, represented in a format whose specification
+    is available to the general public, whose contents can be viewed
+    and edited directly and straightforwardly with generic text
+    editors or (for images composed of pixels) generic paint programs
+    or (for drawings) some widely available drawing editor, and that
+    is suitable for input to text formatters or for automatic
+    translation to a variety of formats suitable for input to text
+    formatters.  A copy made in an otherwise Transparent file format
+    whose markup has been designed to thwart or discourage subsequent
+    modification by readers is not Transparent.  A copy that is not
+    "Transparent" is called "Opaque".</para>
+
+    <para>Examples of suitable formats for Transparent copies include
+    plain ASCII without markup, Texinfo input format, LaTeX input
+    format, SGML or XML using a publicly available DTD, and
+    standard-conforming simple HTML designed for human modification.
+    Opaque formats include PostScript, PDF, proprietary formats that
+    can be read and edited only by proprietary word processors, SGML
+    or XML for which the DTD and/or processing tools are not generally
+    available, and the machine-generated HTML produced by some word
+    processors for output purposes only.</para>
+
+    <para>The "Title Page" means, for a printed book, the title page
+    itself, plus such following pages as are needed to hold, legibly,
+    the material this License requires to appear in the title page.
+    For works in formats which do not have any title page as such,
+    "Title Page" means the text near the most prominent appearance of
+    the work's title, preceding the beginning of the body of the
+    text.</para>
+  </sect1>
+
+  <sect1 label="2">
+    <title>VERBATIM COPYING</title>
+
+    <para>You may copy and distribute the Document in any medium,
+    either commercially or noncommercially, provided that this
+    License, the copyright notices, and the license notice saying this
+    License applies to the Document are reproduced in all copies, and
+    that you add no other conditions whatsoever to those of this
+    License.  You may not use technical measures to obstruct or
+    control the reading or further copying of the copies you make or
+    distribute.  However, you may accept compensation in exchange for
+    copies.  If you distribute a large enough number of copies you
+    must also follow the conditions in section 3.</para>
+
+    <para>You may also lend copies, under the same conditions stated
+    above, and you may publicly display copies.</para>
+  </sect1>
+
+  <sect1 label="3">
+    <title>COPYING IN QUANTITY</title>
+
+    <para>If you publish printed copies of the Document numbering more
+    than 100, and the Document's license notice requires Cover Texts,
+    you must enclose the copies in covers that carry, clearly and
+    legibly, all these Cover Texts: Front-Cover Texts on the front
+    cover, and Back-Cover Texts on the back cover.  Both covers must
+    also clearly and legibly identify you as the publisher of these
+    copies.  The front cover must present the full title with all
+    words of the title equally prominent and visible.  You may add
+    other material on the covers in addition.  Copying with changes
+    limited to the covers, as long as they preserve the title of the
+    Document and satisfy these conditions, can be treated as verbatim
+    copying in other respects.</para>
+
+    <para>If the required texts for either cover are too voluminous to
+    fit legibly, you should put the first ones listed (as many as fit
+    reasonably) on the actual cover, and continue the rest onto
+    adjacent pages.</para>
+
+    <para>If you publish or distribute Opaque copies of the Document
+    numbering more than 100, you must either include a
+    machine-readable Transparent copy along with each Opaque copy, or
+    state in or with each Opaque copy a publicly-accessible
+    computer-network location containing a complete Transparent copy
+    of the Document, free of added material, which the general
+    network-using public has access to download anonymously at no
+    charge using public-standard network protocols.  If you use the
+    latter option, you must take reasonably prudent steps, when you
+    begin distribution of Opaque copies in quantity, to ensure that
+    this Transparent copy will remain thus accessible at the stated
+    location until at least one year after the last time you
+    distribute an Opaque copy (directly or through your agents or
+    retailers) of that edition to the public.</para>
+
+    <para>It is requested, but not required, that you contact the
+    authors of the Document well before redistributing any large
+    number of copies, to give them a chance to provide you with an
+    updated version of the Document.</para>
+  </sect1>
+
+  <sect1 label="4">
+    <title>MODIFICATIONS</title>
+
+    <para>You may copy and distribute a Modified Version of the
+    Document under the conditions of sections 2 and 3 above, provided
+    that you release the Modified Version under precisely this
+    License, with the Modified Version filling the role of the
+    Document, thus licensing distribution and modification of the
+    Modified Version to whoever possesses a copy of it.  In addition,
+    you must do these things in the Modified Version:</para>
+
+    <orderedlist numeration="upperalpha">
+      <listitem><para>Use in the Title Page
+      (and on the covers, if any) a title distinct from that of the
+      Document, and from those of previous versions (which should, if
+      there were any, be listed in the History section of the
+      Document).  You may use the same title as a previous version if
+      the original publisher of that version gives permission.</para>
+      </listitem>
+
+      <listitem><para>List on the Title Page,
+      as authors, one or more persons or entities responsible for
+      authorship of the modifications in the Modified Version,
+      together with at least five of the principal authors of the
+      Document (all of its principal authors, if it has less than
+      five).</para>
+      </listitem>
+
+      <listitem><para>State on the Title page
+      the name of the publisher of the Modified Version, as the
+      publisher.</para>
+      </listitem>
+
+      <listitem><para>Preserve all the
+      copyright notices of the Document.</para>
+      </listitem>
+
+      <listitem><para>Add an appropriate
+      copyright notice for your modifications adjacent to the other
+      copyright notices.</para>
+      </listitem>
+
+      <listitem><para>Include, immediately
+      after the copyright notices, a license notice giving the public
+      permission to use the Modified Version under the terms of this
+      License, in the form shown in the Addendum below.</para>
+      </listitem>
+
+      <listitem><para>Preserve in that license
+      notice the full lists of Invariant Sections and required Cover
+      Texts given in the Document's license notice.</para>
+      </listitem>
+
+      <listitem><para>Include an unaltered
+      copy of this License.</para>
+      </listitem>
+
+      <listitem><para>Preserve the section
+      entitled "History", and its title, and add to it an item stating
+      at least the title, year, new authors, and publisher of the
+      Modified Version as given on the Title Page.  If there is no
+      section entitled "History" in the Document, create one stating
+      the title, year, authors, and publisher of the Document as given
+      on its Title Page, then add an item describing the Modified
+      Version as stated in the previous sentence.</para>
+      </listitem>
+
+      <listitem><para>Preserve the network
+      location, if any, given in the Document for public access to a
+      Transparent copy of the Document, and likewise the network
+      locations given in the Document for previous versions it was
+      based on.  These may be placed in the "History" section.  You
+      may omit a network location for a work that was published at
+      least four years before the Document itself, or if the original
+      publisher of the version it refers to gives permission.</para>
+      </listitem>
+
+      <listitem><para>In any section entitled
+      "Acknowledgements" or "Dedications", preserve the section's
+      title, and preserve in the section all the substance and tone of
+      each of the contributor acknowledgements and/or dedications
+      given therein.</para>
+      </listitem>
+
+      <listitem><para>Preserve all the
+      Invariant Sections of the Document, unaltered in their text and
+      in their titles.  Section numbers or the equivalent are not
+      considered part of the section titles.</para>
+      </listitem>
+
+      <listitem><para>Delete any section
+      entitled "Endorsements".  Such a section may not be included in
+      the Modified Version.</para>
+      </listitem>
+
+      <listitem><para>Do not retitle any
+      existing section as "Endorsements" or to conflict in title with
+      any Invariant Section.</para>
+      </listitem>
+    </orderedlist>
+
+    <para>If the Modified Version includes new front-matter sections
+    or appendices that qualify as Secondary Sections and contain no
+    material copied from the Document, you may at your option
+    designate some or all of these sections as invariant.  To do this,
+    add their titles to the list of Invariant Sections in the Modified
+    Version's license notice.  These titles must be distinct from any
+    other section titles.</para>
+
+    <para>You may add a section entitled "Endorsements", provided it
+    contains nothing but endorsements of your Modified Version by
+    various parties--for example, statements of peer review or that
+    the text has been approved by an organization as the authoritative
+    definition of a standard.</para>
+
+    <para>You may add a passage of up to five words as a Front-Cover
+    Text, and a passage of up to 25 words as a Back-Cover Text, to the
+    end of the list of Cover Texts in the Modified Version.  Only one
+    passage of Front-Cover Text and one of Back-Cover Text may be
+    added by (or through arrangements made by) any one entity.  If the
+    Document already includes a cover text for the same cover,
+    previously added by you or by arrangement made by the same entity
+    you are acting on behalf of, you may not add another; but you may
+    replace the old one, on explicit permission from the previous
+    publisher that added the old one.</para>
+
+    <para>The author(s) and publisher(s) of the Document do not by
+    this License give permission to use their names for publicity for
+    or to assert or imply endorsement of any Modified Version.</para>
+  </sect1>
+
+  <sect1 label="5">
+    <title>COMBINING DOCUMENTS</title>
+
+    <para>You may combine the Document with other documents released
+    under this License, under the terms defined in section 4 above for
+    modified versions, provided that you include in the combination
+    all of the Invariant Sections of all of the original documents,
+    unmodified, and list them all as Invariant Sections of your
+    combined work in its license notice.</para>
+
+    <para>The combined work need only contain one copy of this
+    License, and multiple identical Invariant Sections may be replaced
+    with a single copy.  If there are multiple Invariant Sections with
+    the same name but different contents, make the title of each such
+    section unique by adding at the end of it, in parentheses, the
+    name of the original author or publisher of that section if known,
+    or else a unique number.  Make the same adjustment to the section
+    titles in the list of Invariant Sections in the license notice of
+    the combined work.</para>
+
+    <para>In the combination, you must combine any sections entitled
+    "History" in the various original documents, forming one section
+    entitled "History"; likewise combine any sections entitled
+    "Acknowledgements", and any sections entitled "Dedications".  You
+    must delete all sections entitled "Endorsements."</para>
+  </sect1>
+
+  <sect1 label="6">
+    <title>COLLECTIONS OF DOCUMENTS</title>
+
+    <para>You may make a collection consisting of the Document and
+    other documents released under this License, and replace the
+    individual copies of this License in the various documents with a
+    single copy that is included in the collection, provided that you
+    follow the rules of this License for verbatim copying of each of
+    the documents in all other respects.</para>
+
+    <para>You may extract a single document from such a collection,
+    and distribute it individually under this License, provided you
+    insert a copy of this License into the extracted document, and
+    follow this License in all other respects regarding verbatim
+    copying of that document.</para>
+  </sect1>
+
+  <sect1 label="7">
+    <title>AGGREGATION WITH INDEPENDENT WORKS</title>
+
+    <para>A compilation of the Document or its derivatives with other
+    separate and independent documents or works, in or on a volume of
+    a storage or distribution medium, does not as a whole count as a
+    Modified Version of the Document, provided no compilation
+    copyright is claimed for the compilation.  Such a compilation is
+    called an "aggregate", and this License does not apply to the
+    other self-contained works thus compiled with the Document, on
+    account of their being thus compiled, if they are not themselves
+    derivative works of the Document.</para>
+
+    <para>If the Cover Text requirement of section 3 is applicable to
+    these copies of the Document, then if the Document is less than
+    one quarter of the entire aggregate, the Document's Cover Texts
+    may be placed on covers that surround only the Document within the
+    aggregate.  Otherwise they must appear on covers around the whole
+    aggregate.</para>
+  </sect1>
+
+  <sect1 label="8">
+    <title>TRANSLATION</title>
+
+    <para>Translation is considered a kind of modification, so you may
+    distribute translations of the Document under the terms of section
+    4.  Replacing Invariant Sections with translations requires
+    special permission from their copyright holders, but you may
+    include translations of some or all Invariant Sections in addition
+    to the original versions of these Invariant Sections.  You may
+    include a translation of this License provided that you also
+    include the original English version of this License.  In case of
+    a disagreement between the translation and the original English
+    version of this License, the original English version will
+    prevail.</para>
+  </sect1>
+
+  <sect1 label="9">
+    <title>TERMINATION</title>
+
+    <para>You may not copy, modify, sublicense, or distribute the
+    Document except as expressly provided for under this License.  Any
+    other attempt to copy, modify, sublicense or distribute the
+    Document is void, and will automatically terminate your rights
+    under this License.  However, parties who have received copies, or
+    rights, from you under this License will not have their licenses
+    terminated so long as such parties remain in full
+    compliance.</para>
+  </sect1>
+
+  <sect1 label="10">
+    <title>FUTURE REVISIONS OF THIS LICENSE</title>
+
+    <para>The Free Software Foundation may publish new, revised
+    versions of the GNU Free Documentation License from time to time.
+    Such new versions will be similar in spirit to the present
+    version, but may differ in detail to address new problems or
+    concerns.  See <ulink
+    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
+
+    <para>Each version of the License is given a distinguishing
+    version number.  If the Document specifies that a particular
+    numbered version of this License "or any later version" applies to
+    it, you have the option of following the terms and conditions
+    either of that specified version or of any later version that has
+    been published (not as a draft) by the Free Software Foundation.
+    If the Document does not specify a version number of this License,
+    you may choose any version ever published (not as a draft) by the
+    Free Software Foundation.</para>
+  </sect1>
+
+  <sect1 label="">
+    <title>How to use this License for your documents</title>
+
+    <para>To use this License in a document you have written, include
+    a copy of the License in the document and put the following
+    copyright and license notices just after the title page:</para>
+
+<blockquote><para>
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.1
+      or any later version published by the Free Software Foundation;
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+      A copy of the license is included in the section entitled "GNU
+      Free Documentation License".
+</para></blockquote>
+
+    <para>If you have no Invariant Sections, write "with no Invariant
+    Sections" instead of saying which ones are invariant.  If you have
+    no Front-Cover Texts, write "no Front-Cover Texts" instead of
+    "Front-Cover Texts being LIST"; likewise for Back-Cover
+    Texts.</para>
+
+    <para>If your document contains nontrivial examples of program
+    code, we recommend releasing these examples in parallel under your
+    choice of free software license, such as the GNU General Public
+    License, to permit their use in free software.</para>
+  </sect1>
+
+</appendix>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-parent-document: ("referenz.sgml" "appendix")
+sgml-exposed-tags:nil
+sgml-local-ecat-files:nil
+sgml-local-catalogs: CATALOG
+sgml-validate-command: "nsgmls -s referenz.sgml"
+ispell-skip-sgml: t
+End:
+-->
diff --git a/doc/users_guide/gimp-edition.sgml b/doc/users_guide/gimp-edition.sgml
new file mode 100644
index 0000000..6834bbd
--- /dev/null
+++ b/doc/users_guide/gimp-edition.sgml
@@ -0,0 +1,58 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY title   SYSTEM "title.sgml">
+<!ENTITY history SYSTEM "history.sgml">
+<!ENTITY gimp    SYSTEM "gimp.sgml">
+<!ENTITY cups    SYSTEM "cups.sgml">
+<!ENTITY utils   SYSTEM "utils.sgml">
+<!ENTITY gfdl    SYSTEM "gfdl.sgml">
+]>
+<book>
+
+ <bookinfo>
+  <title>The User's Guide to the Gutenprint - GIMP Edition</title>
+  <date>April 7, 2002</date>
+  <pubdate>April 7, 2002</pubdate>
+  <author>
+    <firstname>Andy</firstname>
+    <surname>Stewart</surname>
+  </author>
+  <copyright>
+    <year>2002</year>
+    <holder>Andy Stewart</holder>
+  </copyright>
+  <legalnotice>
+    <para>The User's Guide to the Gutenprint - GIMP Edition, Copyright
+2002, Andy Stewart.
+    </para>
+
+&title;
+
+<chapter><title>GIMP Edition</title>
+
+  <caution><title>PLEASE NOTE</title>
+
+    <para>
+    This manual includes a subset of chapters from a more complete
+manual entitled <emphasis>The User's Guide to the Gutenprint Top
+Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
+to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
+Project</ulink> home page.
+    </para>
+    <para>
+    This version of the manual has been specifically packaged in this
+way in an attempt to better suit the needs of people interested only
+in using the Gutenprint software with 
+<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image Manipulation Program).
+    </para>
+
+  </caution>
+
+</chapter>
+
+&history;
+&gimp;
+&gfdl;
+</book>
+
+
+
diff --git a/doc/users_guide/gimp.sgml b/doc/users_guide/gimp.sgml
new file mode 100644
index 0000000..d8e5ae3
--- /dev/null
+++ b/doc/users_guide/gimp.sgml
@@ -0,0 +1,886 @@
+
+ <chapter id="ch-gimp-and-gimp-print"><title>GIMP and Gutenprint</title>
+
+  <sect1>
+   <title>Running the GIMP</title>
+  <para>
+   This section assumes that you have the GIMP version 1.2 installed
+and working properly on your computer, and that you have an image of
+some type that you desire to print. To get started quickly, log into
+your system, start the X window system, and bring up your favorite terminal
+window.  At the $ prompt, type:
+
+  <programlisting>
+  <![ CDATA [
+     $ gimp &
+    ]]>
+  </programlisting>
+
+   This should start the GIMP for you. If it does not, check that
+you have installed the GIMP properly, and that its binary is located
+in one of the directories listed in your &dollar;PATH environment
+variable. On the assumption that this worked, the screen should now
+look something like this:
+
+   <figure><title>The Startup Window for The GIMP</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata fileref="figures/gimp_startup.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>Startup window for The GIMP</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   </para>
+   <para>
+   At this point, you should use the
+
+    <menuchoice>
+      <guimenu>File</guimenu>
+      <guimenuitem>Open</guimenuitem>
+    </menuchoice>
+
+menu option to open your favorite picture. We will print this picture
+shortly. Your picture should be displayed next to the GIMP startup
+window, perhaps looking similar to the following (sssh! Don't tell
+anybody the secret!):
+
+   <figure><title>A Sample Image Displayed by The GIMP</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="50" fileref="figures/gimp_image.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>A Sample Image displayed by The Gimp</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+  </para>
+
+  </sect1>
+
+  <sect1><title>The Gimp-Print Graphical User Interface</title>
+  <para>
+   Now that the GIMP is displaying your picture, put your mouse over
+the picture and click the right mouse button. A menu will appear.
+Choose the
+    <menuchoice>
+      <guimenu>File</guimenu>
+      <guimenuitem>Print</guimenuitem>
+    </menuchoice>
+menu option. This will cause the Gimp-Print GUI window to appear (see
+<xref linkend="fig-gimp-print-gui">). Move the mouse cursor
+over the various parts of the Gimp-Print GUI window, and notice that
+if you leave your mouse in one place for a short time without clicking
+any buttons, a small box appears.  This box contains helpful text.
+These small boxes are called "tooltips" and are intended to remind you
+about the function of each part of the graphical interface.
+    </para>
+    <para>
+The next several sections will continuously refer to
+<xref linkend="fig-gimp-print-gui"> and
+<xref linkend="fig-gimp-print-gui-1">.  The difference between
+the two figures can be seen in the top right corner of the window.
+Notice that there are two tabs, one which reads
+<guilabel>Printer Settings</guilabel> and another which reads
+<guilabel>Image/Output Settings</guilabel>.  Notice also that the
+window is divided into several major sections which directly map to
+the major sections of this document:
+  <itemizedlist>
+    <listitem>
+      <para><link linkend="sec-preview">Preview</link></para>
+    </listitem>
+    <listitem>
+      <para><link linkend="sec-printer-settings">Printer Settings</link></para>
+    </listitem>
+    <listitem>
+      <para><link linkend="sec-printer-settings">Image/Output Settings</link></para>
+    </listitem>
+    <listitem>
+      <para><link linkend="sec-position">Position</link></para>
+    </listitem>
+    <listitem>
+      <para><link linkend="sec-scaling">Size</link></para>
+    </listitem>
+    <listitem>
+      <para><link linkend="sec-printing-and-saving-settings">Printing and Saving Settings</link></para>
+    </listitem>
+  </itemizedlist>
+  </para>
+
+   <figure id="fig-gimp-print-gui"><title>The Gimp-Print Graphical User Interface 1 (GUI)</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="40" fileref="figures/gimp-print-gui.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The GIMP Print GUI showing printer settings</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+   <figure id="fig-gimp-print-gui-1"><title>The Gimp-Print Graphical User Interface 2 (GUI)</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="40" fileref="figures/gimp-print-gui-1.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The GIMP Print GUI showing image/output settings</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+  <sect2><title id="sec-printer-settings">Printer Settings</title>
+  <indexterm id="idx-printer-settings"><primary>Printer Settings</primary></indexterm>
+
+    <sect3><title>Printer</title>
+    <para>
+      Click on the <guilabel>Printer Settings</guilabel> tab near the
+top right hand corner of the window (see
+<xref linkend="fig-gimp-print-gui">).  Then, click on the downward
+facing arrow to the right of the <guilabel>Printer</guilabel> combo
+box to see a list of the system printer queues.  Select the queue to which
+you would like the printed image to be sent.  One may also print the
+image directly to a file by selecting <guimenuitem>File</guimenuitem>.
+In this event, the user will be prompted for the filename when either the
+<guibutton>Print</guibutton> button or the <guibutton>Print and Save
+Settings</guibutton> button is clicked.
+     </para>
+     <para>
+When either the <guibutton>Print and Save Settings</guibutton> button
+or the <guibutton>Save Settings</guibutton> button is clicked,
+the settings are saved in a file called
+<filename>~/.gimp-1.2/printrc</filename>.  The user is cautioned about
+hand editing this file since it is generated by Gutenprint (although
+it was the only way that the author found for removing bogus entries
+created while playing with the <guibutton>New Printer</guibutton> button).
+    </para>
+    </sect3>
+
+    <sect3><title>Setup Printer</title>
+    <para>
+     Before any useful printing can occur, the user needs to associate
+the named printer with the
+actual make and model of the printer.  Click the
+<guibutton>Setup Printer</guibutton> button in
+the <guilabel>Printer</guilabel> section of the window (the upper
+right, and just below the Printer display box). When this is done, the
+following window appears:
+
+   <figure><title>The Setup Printer Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="60" fileref="figures/gimp-print-setup.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The Setup Printer Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+    </para>
+
+    <para>
+     Scroll through the Printer Model section of the window until you
+find a printer which matches yours. If you cannot find the precise
+model, pick something close and hope for the best.  There are selections
+for a wide array of Postscript, inkjet, and laser printers.  After you
+have selected a printer, you will see the printer command displayed.
+    </para>
+    <para>
+The Gutenprint software does all of the necessary conversion of the
+image to be printed into the language of your printer. It is
+unnecessary and undesirable for any other sofware to manipulate this
+data.  (This is why the command contains the "-l" switch or the "-o
+raw" switch).  Please use care if you feel the need to edit this
+command.  Once you are satisfied with your selection, click the
+<guibutton>OK</guibutton> button.
+    </para>
+
+    </sect3>
+
+    <sect3><title>New Printer</title>
+
+    <para>
+     In the previous sections, the user selected an existing printer
+queue and associated a particular type of printer to that queue.  For
+most cases, this is probably all that is required.  However, some
+situations might require more detailed control over the handling of
+the printer data.
+     </para>
+     <para>
+     Click the <guibutton>New Printer</guibutton> button to tell the
+software that you wish to create a new name.  In this case, the new
+name may actually be an existing printer with different settings that
+you wish to save, or it may simply be a name associated with a
+particular command for handling the printer data.  A window will
+appear thus:
+
+   <figure><title>The New Printer Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata fileref="figures/gimp-print-new-printer.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>The New Printer Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+    Type a name into the window and click <guibutton>OK</guibutton>
+(or <guibutton>Cancel</guibutton> if you wish not to do this).
+Notice that the new name now appears as the selected <guilabel>Printer</guilabel>.
+As you change settings in the rest of the Gimp-Print GUI, they will be
+associated with this printer name.  When the settings are saved,
+they can be recovered easily by simply selecting this named printer
+from the Printer combo box.
+    </para>
+    <para>
+    One example where this feature might be used is as follows.  The
+author frequently prints photos on Epson 4x6 photo paper.  Note that
+this paper is physically larger than 4x6 and it has perforations on
+all four sides.  The author dislikes printing part of the image on the
+perforated parts of the paper which will be removed after
+printing the photo.  By selecting the proper scaling percentage,
+printing can be constrained to the 4x6 part of the paper which will
+remain after the perforated sections are removed.  The author has
+saved this setting using this feature of the Gutenprint software.
+    </para>
+
+    </sect3>
+
+   <sect3><title>Media Size</title>
+   <para>
+     The term <emphasis>media</emphasis> refers to paper, card stock,
+envelopes, or whatever you have put into your printer onto which
+something will be printed.  Click the arrow to the right of the
+<guilabel>Media Size</guilabel> box to see a long list of different
+sizes of media.  Choose the size that matches the media which you have
+loaded into your printer.  Once you have made your choice, the drop
+down menu will disappear, and your choice will be shown in the
+<guilabel>Media Size</guilabel> box.  The available paper sizes will
+vary depending upon the printer model you have selected.
+   </para>
+   <para>
+   Some printers support arbitrary (within limits!) paper sizes.
+   These printers will let you select <emphasis>Custom</emphasis>
+   or <emphasis>Roll</emphasis> paper sizes.  When you select such a
+   printer, one or both of the <guilabel>Dimensions</guilabel> boxes
+   will let you enter your paper size (in inches or centimetres).  The
+   boxes will not let you enter sizes that your printer cannot handle.
+   </para>
+   </sect3>
+
+   <sect3><title>Media Type</title>
+   <para>
+     The type of media onto which your image will be printed should be
+selected here.  Click on the arrow to the right of the <guilabel>Media
+Type</guilabel> box to see a long list of the different types of media
+onto which you may print your image.  Media types include such things
+as plain paper, postcards, photo quality paper, transparencies, and
+more!  Once you have made your choice, the drop down menu will
+disappear, and your choice will be shown in the <guilabel>Media
+Type</guilabel> box.  The choices available will vary depending upon
+the printer model you have selected.
+   </para>
+   </sect3>
+
+   <sect3><title>Media Source</title>
+   <para>
+     The <guilabel>Media Source</guilabel> box allows the user to
+  choose the paper source, sometimes called <emphasis>Input
+  Slot</emphasis>, that the paper will be fed from.  Many printers
+  only have one available input source (such as the standard paper
+  tray), in which case this entry will be grayed out.  If your printer
+  does support multiple input sources, you may specify the source of
+  your choice here.  Some Epson printers offer a roll feed option in
+  addition to the standard paper tray, and many HP LaserJet printers
+  have multiple paper trays.
+   </para>
+   </sect3>
+
+   <sect3><title>Ink Type</title>
+   <para>
+   Some printers offer a choice of different types of ink or ink
+   cartridges.  Many Canon and Lexmark printers support various
+   combinations of cartridges, such as black only, black and color,
+   photo color, and so forth.  Most Epson printers let you choose
+   between three and four color printing (three color uses only color
+   ink, while four color uses black ink as well).  Epson printers that
+   support six color photo printing allow you to choose five and six
+   color printing as well.
+   </para>
+   </sect3>
+
+   <sect3><title>Resolution</title>
+   <para>
+     Click on the arrow to the right of the
+<guilabel>Resolution</guilabel> box to see a long list of resolutions
+at which you can print your image.  The list is written with the
+lowest resolution at the top, with increasing resolution (and
+generally improved printing quality) as you approach the bottom of the
+list.  Different printers support different resolution options, and
+many printers support different quality choices using the same basic
+resolution.  In this menu are a few terms which may be unfamiliar to
+you, and they will now be explained.
+   </para>
+     <sect4><title>DPI</title>
+       <para>
+         DPI is an acronym which stands for <emphasis>D</emphasis>ots
+<emphasis>P</emphasis>er <emphasis>I</emphasis>nch.  This term refers
+to the number of dots that your printer will print in a space of one
+inch (approximately 2.54 cm).  This is highly dependent upon the
+capability of your printer.  Resolutions below 300 DPI are
+used for draft quality.  For general purpose printing, select
+300 - 360 DPI.  Higher quality printing can be achieved by
+selecting 600 - 720 DPI.  Settings higher than this are used for the
+highest possible quality for printing photographs and other high
+quality graphics.  Experiment with your printer and these settings
+with different types of graphics and photographs to see what
+results you can obtain with your printer.  High resolutions (large
+numbers of dots per inch) require substantial image processing time,
+and the print files can be very large; it's not uncommon for a full
+page, 1440x720 DPI image to require 100 MB of temporary storage!
+       </para>
+     </sect4>
+     <sect4><title>Draft or Fast Economy Draft</title>
+     <para>
+     When this text appears next to the resolution, it refers to the
+fact that the quality will be relatively low, but suitable for rough
+drafts.  Draft quality is higher than fast economy draft.  These
+options will give you the fastest printing speed.  Economy Draft uses
+less ink, and as a result the image will be pale.  These modes are
+generally not very useful for printing photographs.
+     </para>
+     </sect4>
+
+     <sect4><title>Unidirectional</title>
+       <para>
+         When printing an image, you have probably noticed the print
+head inside the printer moving back and forth across the print media.
+Many printers are capable of putting ink on the page regardless of
+which direction the print head is moving.  However, quality can
+sometimes be improved by only putting ink on the page when the printer
+head is moving in one direction.  The
+<guimenuitem>Unidirectional</guimenuitem> setting instructs the
+software to only place ink on the page when the print head is moving
+one way.  When the print head returns, it will not place ink on the
+page.  On many printers, the print quality is better, at the expense
+of printing speed.
+       </para>
+     </sect4>
+     <sect4><title>High(est) Quality</title>
+       <para>
+         With lower quality print modes, one may see an effect where
+the printed image looks like it has rows of stripes with a small
+separation between the stripes.  This effect is called "banding" and
+is undesirable.  In the <emphasis>high</emphasis> and
+<emphasis>highest</emphasis> quality modes, the printer will make more
+passes over the same part of the page in order to improve quality and
+(reduce or) eliminate banding.  This requires more temporary disk
+space and prints more slowly, but does not require significantly more
+processing time.
+       </para>
+     </sect4>
+     <sect4><title>DMT</title>
+       <para>
+       DMT is an acronym which stands for <emphasis>D</emphasis>ot
+       <emphasis>M</emphasis>odulation
+       <emphasis>T</emphasis>echnology.
+       This term refers to a print mode used by certain Canon printers
+       to improve the quality of the printed output.  Unfortunately,
+       at this time,  all of the available DMT modes do not work
+       correctly.  The cases which do work correctly will offer
+       significantly improved printing quality. 
+       </para>
+     </sect4>
+   </sect3>
+   </sect2>
+
+  <sect2><title id="sec-preview">Preview</title>
+  <para>
+   Notice in the upper left of the window is a preview of your image.
+This preview is a representation of where your picture will print on
+the selected media, and approximately what it will look like.  This
+preview will be updated as you modify selections in the
+<guilabel>Position</guilabel>, <guilabel>Size</guilabel>,
+<guilabel>Media Size</guilabel>, and <guilabel>Output Type</guilabel>
+portions of the window. You may also select the image with your mouse
+and move it manually if you wish. In doing so, you will note that the
+<guilabel>Position</guilabel> settings are updated accordingly.  Take
+note of the arrow, which points toward the top of the media, where top
+is the first part of the media to enter the printer.
+  </para>
+  <para>
+  The preview may be moved around the page as follows:
+  </para>
+  <itemizedlist>
+  <listitem><para> Clicking and dragging the <emphasis>left</emphasis>
+  (primary) mouse button moves the image around the page as you would
+  expect; the image moves with the mouse.  </para></listitem>
+  <listitem><para> Clicking and dragging the
+  <emphasis>middle</emphasis> mouse button moves the image around the
+  page in a finer fashion, such that each pixel of mouse movement
+  moves the image by one point (1/72 inch).  This allows very fine
+  placement of the image on the page.  </para></listitem>
+  <listitem><para> Clicking and dragging the
+  <emphasis>right</emphasis> (secondary) mouse button moves the image
+  around the page much the same as with the left button, but the image
+  will only move in units of the image size.  Thus, if the image is
+  one inch wide and two inches tall, the image will not move at all
+  until you have moved the mouse far enough so that the image would be
+  moved one inch vertically and two inches horizontally.  This is
+  handy if you wish to print multiple images of the same size on one
+  piece of paper.</para></listitem>
+  <listitem><para> If you hold down the <emphasis>shift</emphasis> key
+  on the keyboard when you click and drag the mouse, the image will
+  only move in the horizontal or vertical direction (depending upon
+  which way you first move the mouse).  This allows you to constrain
+  motion to the horizontal or vertical. </para></listitem>
+  <listitem><para> If you click another button while dragging the
+  mouse, the image will immediately return to the position it was in
+  before you clicked the mouse the first time.  This allows you to
+  not move the image if you have started moving it and have decided
+  that you don't want to move it.  The preview will not respond to the
+  mouse until you release all of the mouse buttons and click and drag
+  afresh. </para></listitem>
+  </itemizedlist>
+  </sect2>
+
+  <sect2><title id="sec-position">Position</title>
+
+   <sect3><title>Orientation</title>
+   <para>
+      The Orientation menu allows the user to choose the orientation
+of the paper.  The menu selections are
+<guimenuitem>Auto</guimenuitem>, <guimenuitem>Portrait</guimenuitem>,
+<guimenuitem>Landscape</guimenuitem>, <guimenuitem>Upside
+down</guimenuitem>, and <guimenuitem>Seascape</guimenuitem>.  Click on
+the rectangular tab to see these choices
+and make your selection.  When you have done so, the pulldown menu
+will have disappeared, and your choice will appear.  Also, note that
+the preview image will have changed accordingly.
+   </para>
+   <para>
+     When set to <guimenuitem>Auto</guimenuitem>, the software will make an
+intelligent choice of orientation based on the dimensions of the image
+to be printed.   <guimenuitem>Portrait</guimenuitem> orients the print media
+with the longest edge going from top to bottom, while
+<guimenuitem>Landscape</guimenuitem> orients the paper with the longest edge
+going from side to side.  <guimenuitem>Upside down</guimenuitem> and
+<guimenuitem>Seascape</guimenuitem> orient the paper the same as
+<guimenuitem>Portrait</guimenuitem> and  <guimenuitem>Landscape</guimenuitem>
+respectively, with the difference being that the image is rotated 180 degrees.
+   </para>
+   </sect3>
+
+   <sect3><title>Automatic Centering</title>
+   <para>
+      There are three buttons that deal with centering an image.  The
+leftmost button is the <guibutton>Vertically</guibutton> button, the
+middle button is the <guibutton>Both</guibutton> button, and
+the rightmost button is the <guibutton>Horizontally</guibutton>
+button.  Use the <guibutton>Both</guibutton> button to center your
+image both horizontally and vertically.  This will cause the top and
+bottom borders to be equal, and the left and right borders to be
+equal.  If you have placed your image manually by using the mouse
+button, then you may center the image in the horizontal direction only
+by clicking on the <guibutton>Horizontally</guibutton> button.
+Likewise, to adjust the image only in the vertical direction, click on
+the <guibutton>Vertically</guibutton> button.  Note that in
+each case, the image is centered with regard to the edges of the
+media, and without regard to the printable portion of the media.  Many
+printers are incapable of printing to each edge of the media.  Some
+media may have edges which detach.  Consult your printer documentation
+for more details regarding your printer's capabilities in this regard.
+   </para>
+   </sect3>
+
+   <sect3><title>Manual Settings</title>
+   <para>
+      You will notice that there are six boxes that contain numbers
+just below the Orientation menu and just above the GUI buttons related
+to centering an image.  When you move the preview image manually with
+the mouse, or when you click on one of the centering buttons, the
+preview image moves and these six boxes get updated.
+   </para>
+   <sect4><title>Left</title>
+   <para>
+     The number appearing in the <guimenuitem>Left</guimenuitem> box denotes
+the number of units (cm or inches) that the left side of the image
+will be printed away from the left edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+   <sect4><title>Right</title>
+   <para>
+     The number appearing in the <guimenuitem>Right</guimenuitem> box denotes
+the number of units (cm or inches) that the right side of the image
+will be printed away from the left edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+   <sect4><title>Right Border</title>
+   <para>
+     The number appearing in the <guimenuitem>Right Border</guimenuitem> box denotes
+the number of units (cm or inches) that the right side of the image
+will be printed away from the right edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+   <sect4><title>Top</title>
+   <para>
+     The number appearing in the <guimenuitem>Top</guimenuitem> box denotes
+the number of units (cm or inches) that the top side of the image
+will be printed away from the top edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+   <sect4><title>Bottom</title>
+   <para>
+     The number appearing in the <guimenuitem>Bottom</guimenuitem> box denotes
+the number of units (cm or inches) that the bottom side of the image
+will be printed away from the top edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+
+   <sect4><title>Bottom Border</title>
+   <para>
+     The number appearing in the <guimenuitem>Bottom Border</guimenuitem> box denotes
+the number of units (cm or inches) that the bottom side of the image
+will be printed away from the bottom edge of the media.  You may select
+the units by clicking the <guibutton>Inch</guibutton> or
+<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
+these GUI boxes.
+   </para>
+   </sect4>
+
+   </sect3>
+
+  </sect2>
+
+  <sect2><title id="sec-scaling">Size</title>
+
+   <sect3><title>Slider Bar and Spin Box</title>
+   <para>
+      The slider bar can be moved as desired by the user.  Notice
+that while sliding this bar, the preview image changes accordingly.
+One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
+These boxes are the six position boxes (left, right, right border,
+top, bottom, bottom border), the two size boxes (width and height),
+and the spin box to the right of the slider bar.
+   </para>
+   <para>
+   This slider bar is used to scale the image to a desirable size, but the same effect can
+be obtained by either clicking an arrow on the spin box to the right of this
+slider bar, or by manually typing a number into this spin box.  Notice
+that by setting the spin box in this way, the slider bar is also
+moved.  All of the described methods will cause the image to be
+scaled accordingly.
+   </para>
+   </sect3>
+
+   <sect3><title>Scale by Percent or PPI</title>
+   <para>
+       One may choose to scale the image by a percentage, or by PPI,
+which means "<emphasis>p</emphasis>ixels <emphasis>p</emphasis>er
+<emphasis>i</emphasis>nch".  Click the radio button
+next to the word to set the desired scaling factor.
+   </para>
+   <para>
+     When scaling by a percentage, the number reflected in the spin
+box next to the slider bar represents the percentage relative
+to the full size of the selected print medium.  For example, with this spin box
+set to 50, the image will be scaled to 50% of the size of the print
+medium.  When set to 100, the image will attempt to fill the print
+medium, within the constraints of maintaining the proper aspect ratio
+and the margins of the selected print medium.  This effect can be seen
+in the preview window.
+   </para>
+   <para>
+     When scaling by PPI, the number reflected in the spin box next to
+the slider bar represents the number of pixels that will be
+printed per inch.  For example, if the user is printing a 640x480
+image at a size of 6.4x4.8 inches (as measured by the size boxes), the
+image will be printed at 100 DPI.
+   </para>
+   </sect3>
+
+   <sect3><title>Use Original Image Size</title>
+     <para>
+       By clicking this button, the image will be scaled to as close
+to the native size of the image as possible.  This effect can
+immediately be seen in the preview image.
+     </para>
+     <para>
+     The native image size may be found or set in the GIMP by
+     selecting <guimenuitem>Image/Scale Image</guimenuitem> in the
+     GIMP.  Under the <guilabel>Print Size and Display Unit</guilabel>
+     group in the <guilabel>Scale Image</guilabel> dialog, you can
+     determine (or change) the width and height of the image, or
+     choose the resolution.
+     </para>
+   </sect3>
+
+   <sect3><title>Width and Height</title>
+     <para>
+       These boxes show the size of the printed image in either inches
+or centimeters (depending on which unit is selected).  The user may
+choose to manually modify these values.  When one value is modified,
+the other value is automatically modified in order to maintain the
+aspect ratio (the ratio of width to height).  This effect can be
+immediately seen in the preview image.
+     </para>
+   </sect3>
+
+   <sect3><title>Units</title>
+   <para>
+      The units can be set to inches or centimeters by clicking the appropriate
+radio button next to the desired unit.  This setting effects the
+values printed in the six position boxes (left, right, right border,
+top, bottom, bottom border) and the two size boxes (width and height).
+   </para>
+   </sect3>
+
+  </sect2>
+
+  <sect2><title id="sec-image-settings">Image/Output Settings</title>
+   <para>
+   By clicking on the tab labeled <guilabel>Image/Output
+Settings</guilabel>, the Gimp-Print window will appear as shown in
+<xref linkend="fig-gimp-print-gui-1">.  Notice that there are
+two sections to this portion of the window, namely,
+<guilabel>Image Type</guilabel> and
+<guilabel>Output Type</guilabel>.
+
+   </para>
+
+   <sect3><title>Image Type</title>
+
+    <sect4><title>Line Art</title>
+    <para>
+      This setting tells the printer driver to generate color
+quickly.  The color is bold and bright, but color accuracy is not very
+good.  There may also be some unexpectedly sharp transitions in
+colors.  This mode is acceptable for printing text with small amounts
+of color, and may be acceptable for presentation graphics.
+    </para>
+    </sect4>
+
+    <sect4><title>Solid Colors</title>
+    <para>
+      This mode produces color which is considerably more accurate
+than the <guilabel>Line Art</guilabel> mode, but with a reduction in performance.  In
+general, hues will be accurate but tonalities may not be accurate.
+There should be no sharp transitions in colors.  This mode is good for
+printing presentation graphics in most cases.
+    </para>
+    </sect4>
+
+    <sect4><title>Photograph</title>
+    <para>
+      This mode produces the most accurate colors and tonalities at a
+greater cost in performance.  This is the mode to use when printing
+high quality photographs or other high quality images.
+    </para>
+    </sect4>
+
+   </sect3>
+
+   <sect3><title>Output Type</title>
+    <para>
+      The user is given the choice of color, black and white, and
+grayscale.  Color is selected when the desired output is to be in
+color.  Greyscale will result in the printed image having various
+shades of grey.  Black and white is just that.  The effect of this
+setting can be seen in the preview window.
+    </para>
+   </sect3>
+
+   <sect3><title>Adjust Output</title>
+    <para>
+      Clicking on this button causes the <guilabel>Print Color Adjust</guilabel> window to
+appear (see <xref linkend="fig-gimp-print-color-adjust">).  In
+this window, one will see a representation of the image to be printed
+as well as several slider bars.  These slider bars collectively adjust
+many different aspects of the image.  The values can also be adjusted
+by clicking the arrows or by typing a value into the appropriate spin
+box on the right side of each slider bar.
+   </para>
+
+   <figure id="fig-gimp-print-color-adjust"><title>The Print Color Adjust Window</title>
+   <mediaobject>
+   <imageobject>
+   <imagedata scale="50" fileref="figures/gimp-print-print-color-adjust.png" FORMAT="PNG">
+   </imageobject>
+   <textobject>
+   <phrase>>The Print Color Adjust Window</phrase>
+   </textobject>
+   </mediaobject>
+   </figure>
+
+    <sect4><title>Brightness</title>
+    <para>
+    Adjust the brightness of the image.  A setting of 0.0 gives a fully black
+image, while a 2.0 setting gives a fully white image.  Values greater than 1.0 will result in
+ black not being solid and highlights turning white; values less than
+ 1.0 will result in white not being perfectly clear and shadows turning
+ black.
+    </para>
+    </sect4>
+
+    <sect4><title>Contrast</title>
+    <para>
+    Adjust the contrast of the image.  A setting of 0.0 gives a solid gray for the
+entire image, the exact gray depending upon the brightness chosen.
+    </para>
+    </sect4>
+
+    <sect4><title>Cyan, Magenta, Yellow</title>
+    <para>
+These three options allow specification of the cyan, magenta, and
+yellow levels independently, for rebalancing the levels.  Normally,
+these should be adjusted to yield neutral gray, but they can be used
+for other effects.
+    </para>
+    </sect4>
+
+    <sect4><title>Saturation</title>
+    <para>
+Adjust the brilliance of colors.  A setting of 0.0 results in pure grayscale.
+A saturation setting of less than 1.0 results in more muted colors.  A
+saturation setting of greater than 1.0 results in more vibrant colors.  Very high
+saturation often results in very strange effects, including
+posterization and banding that might not be expected.  For normal
+purposes, the saturation should generally be set to a value less than 1.5.
+    </para>
+    </sect4>
+
+    <sect4><title>Density</title>
+    <para>
+Adjust the amount of ink deposited on the paper.  If you have chosen the
+correct paper type and are getting ink bleeding through the paper
+or puddling, try reducing the density to the lowest value you
+can while still achieving solid black.  If black is not solid
+black, even with the contrast and brightness at 1.0, try increasing
+the density.  Note that changes to this setting will not be visible in
+the image preview.
+    </para>
+    <para>
+All of the supported printers actually need less than 100% ink
+density in most cases, so the actual density is something other than
+the nominal density setting.  The effective density setting cannot go
+above 100%, so if a value specified will result in an excessively high
+density level, it will be silently limited to a setting of 1.0.
+    </para>
+    </sect4>
+
+    <sect4><title>Gamma</title>
+    <para>
+Adjust the gamma of the image, over and above the printer-specific
+correction.  Gamma less than 1.0 will result in a darker image; gamma
+greater than 1.0 will result in a lighter image.  Unlike brightness,
+gamma adjustment does not change the endpoints; it merely changes the
+shape of the input->output curve.
+    </para>
+    </sect4>
+
+    <sect4><title>Dither Algorithm</title>
+    <para>
+The recommended dither algorithm is <guimenuitem>Adaptive
+Hybrid</guimenuitem> (which is the default) for text or other fine
+black detail, or if this is mixed with continuous tone images.  The
+<guimenuitem>Ordered</guimenuitem> dithering algorithm is just as good
+(and somewhat faster) for pure continuous-tone images and photographs,
+but may yield poor results with text or other fine detail,
+particularly at high printing resolutions.
+    </para>
+    <para> The <guimenuitem>Fast</guimenuitem> algorithm gives the
+fastest results at the expense of color accuracy.  It is a simplified
+ordered dither.  On simple four color printers (or other printers used
+in four color mode), the quality is similar to
+<guimenuitem>Ordered</guimenuitem>, although dark gray rendition is
+not as good due to a simpler transfer between black and colored ink.
+With six-color printers, color rendition is somewhat worse, but it
+should be quite usable in cases where optimum quality is not critical.
+In black and white, it is an efficient way to render grayscale, but it
+may not give best results when used with variable dot size printers
+(modern Epson printers, or Canon printers using DMT).  On rare three
+color printers (CMY only) the results should be identical to ordered
+dither.
+    </para>
+    <para> <guimenuitem>Very Fast</guimenuitem> is even faster than
+<guimenuitem>Fast</guimenuitem>, with even more loss of quality.
+Color and grayscale output will show strong patterning that resembles
+screening, although it isn't.  On laser printers, and possibly on
+certain kinds of text and line art, <guimenuitem>Very
+Fast</guimenuitem> dithering may actually yield the best quality.
+    </para>
+    <para>
+Error diffusion algorithms (<guimenuitem>Hybrid
+Floyd-Steinberg</guimenuitem> is such an algorithm) perform very well
+at high densities, and are capable of
+rendering very fine detail rather well, but they tend to exhibit artifacts in
+the form of "waves" or "worms" of dots which results in noticeable
+texturing in pale areas.  Furthermore, pale areas immediately adjacent
+to white take a while to "build up" sufficient error to print at all.
+This is sometimes called "tearing" or "waterfalling".
+    </para>
+
+    </sect4>
+
+    <sect4><title>Set Defaults and Close</title>
+    <para>
+      When the <guibutton>Set Defaults</guibutton> button is clicked,
+the slider bar settings will return to their default values.  The
+dither algorithm setting is uneffected.  The <guilabel>Print Color
+Adjust</guilabel> window will close when the
+<guibutton>Close</guibutton> button is clicked.
+    </para>
+    </sect4>
+
+   </sect3>
+
+  </sect2>
+
+  <sect2><title id="sec-printing-and-saving-settings">Printing and Saving Settings</title>
+    <para>
+    At the bottom of the Gimp-Print window, there are five buttons labeled
+<guibutton>About</guibutton>,
+<guibutton>Print and Save Settings</guibutton>,
+<guibutton>Save Settings</guibutton>,
+<guibutton>Print</guibutton>,
+and <guibutton>Cancel</guibutton>.  The <guibutton>About</guibutton>
+button will show information about the Gutenprint software, such as
+the version number, authors names, project web site, and software
+licensing.  After clicking on the <guibutton>About</guibutton>, read
+the information, and then close the window by pressing the
+<guibutton>OK</guibutton> button.
+    </para>
+    <para>
+      The <guibutton>Print and Save Settings</guibutton> button will
+save the current settings and then print the desired image.  Recall
+that these settings are saved in <filename>~/.gimp-1.2/printrc</filename>.  The
+<guibutton>Save Settings</guibutton> button will only save the
+settings.  The <guibutton>Print</guibutton> button will print the
+image only.  The <guibutton>Cancel</guibutton> will close the
+Gimp-Print GUI window.
+    </para>
+  </sect2>
+
+  </sect1>
+
+ </chapter>
diff --git a/doc/users_guide/history.sgml b/doc/users_guide/history.sgml
new file mode 100644
index 0000000..2782f2b
--- /dev/null
+++ b/doc/users_guide/history.sgml
@@ -0,0 +1,108 @@
+
+  <chapter><title>Project History</title>
+  <para>
+This software package was first written by Michael Sweet of
+<ulink url="http://www.easysw.com">Easy Software Products</ulink> and
+initially worked only as a print plugin to the GIMP (GNU Image
+Manipulation Program).  In the summer of 1999,
+Robert Krawitz (the current
+Gutenprint project leader) purchased an Epson Stylus Photo EX printer
+to feed his photography hobby. Finding no existing printer drivers, Robert
+adapted Mike's GIMP Print plugin to his six-color printer, and by the end
+of the year released version 3.0 of the Gimp-Print software, which was
+included in version 1.1 of the GIMP.  The intention was for this to be
+the stable plugin in version 1.2 of the GIMP while development of the
+GIMP Print plugin continued for later release.
+  </para>
+  <para>
+Robert put the Gimp-Print development tree on SourceForge starting
+with version 3.1, and quickly found a group of like-minded people who wanted to print
+high quality output on inexpensive inkjet printers. One of the main
+goals, which was not expected to be met until late in the version 3.1
+cycle, was to write a Ghostscript driver so that printing would not be
+restricted to the GIMP.  Imagine Robert's surprise when Henryk "Buggs"
+Richter wrote one within days!
+  </para>
+  <para>
+In July 2000, not more than a year after Robert bought his Epson
+Stylus Photo EX, he was invited to the Linux Printing
+Summit hosted by VA Linux Systems. In preparation for that, he spent
+long hours printing out test images.  Robert went back to the
+Gimp-Print version 3.0.9 release, which seemed like such an advance
+at the time,  and was floored at how far the project had come in four
+months! Output that had been considered impressive with using six
+colors was put to shame by four color output. That should give you
+an idea what six color and variable dot size printers can do. It also
+illustrates what a group of committed people can do.
+  </para>
+  <para>
+Robert came away from the Printing Summit with a lot of new ideas, and in
+November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
+of work by the team.  The quality was already tremendously improved
+over what the software could do at the Printing Summit.
+  </para>
+  <para>
+The team started serious work on version 4.1 in December
+2000, and version 4.2.0 was released in November 2001.  Despite the fact
+that version 4.2.0 is a "minor" release over version 4.0, there are vast
+improvements:
+  <itemizedlist>
+    <listitem>
+      <para>
+      The driver is built as a shared library, making it much easier
+to use by higher layers of software
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+      The packaging system now follows GNU standards
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+      Improved performance
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+      Many more options
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+      More supported printers
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  </para>
+  <para>
+Releases of Gimp-Print have been historically numbered in
+a fashion similar to that of the Linux kernel, where major releases
+are denoted by the first digit (in this case '4'), while minor
+releases are denoted by subsequent digits (such as '4.2.0').  Even
+numbered minor releases are considered stable, while odd numbered
+minor releases are considered development releases (whose stability
+may vary for any given release).
+  </para>
+  <para>
+This project is by no means finished.  In future releases, the development
+team hopes to include the following:
+  <itemizedlist>
+    <listitem><para>implementation of proper color management</para></listitem>
+    <listitem><para>improved dithering</para></listitem>
+    <listitem><para>improvements in performance</para></listitem>
+  </itemizedlist>
+  </para>
+  <para>
+The entire Gutenprint team hopes you will really enjoy using this
+software!  For more information, please consult the Gutenprint project
+<ulink url="http://gimp-print.sourceforge.net">web page</ulink>.
+  </para>
+  </chapter>
diff --git a/doc/users_guide/html-stamp b/doc/users_guide/html-stamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/users_guide/html-stamp
diff --git a/doc/users_guide/html/book1.html b/doc/users_guide/html/book1.html
new file mode 100644
index 0000000..09f72ed
--- /dev/null
+++ b/doc/users_guide/html/book1.html
@@ -0,0 +1,487 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>The User's Guide to Gutenprint - Complete Edition</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="NEXT"
+TITLE="Project History"
+HREF="c29.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="BOOK"
+><DIV
+CLASS="BOOK"
+><A
+NAME="AEN1"
+></A
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+><A
+NAME="AEN2"
+>The User's Guide to Gutenprint - Complete Edition</A
+></H1
+><H3
+CLASS="AUTHOR"
+><A
+NAME="AEN6"
+></A
+>Andy Stewart</H3
+><P
+CLASS="COPYRIGHT"
+><A
+HREF="ln12.html"
+>Copyright</A
+> &copy; 2002 Andy Stewart</P
+><DIV
+><DIV
+CLASS="ABSTRACT"
+><P
+></P
+><A
+NAME="AEN16"
+></A
+><P
+>    The Gutenprint Top Quality Printer Drivers (hereafter
+called Gutenprint) are a set of printer drivers written to
+take advantage of the full capabilities of a wide range of
+printers. These drivers should work on any POSIX compliant operating
+system (e.g. Linux, Solaris, IRIX, etc).  This document will explain how to
+use the Gutenprint software to achieve high quality printouts from the
+<A
+HREF="http://www.gimp.org"
+TARGET="_top"
+>GIMP</A
+> (GNU Image
+Manipulation Program) and
+<A
+HREF="http://www.cups.org"
+TARGET="_top"
+>CUPS</A
+> (Common Unix Printing
+System).
+  </P
+><P
+>    Please note that in addition to using the Gutenprint software as a
+print plugin for the GIMP, and as a set of printer drivers for CUPS, this
+software can also be compiled and used with the 
+<A
+HREF="http://www.ghostscript.com"
+TARGET="_top"
+>Ghostscript</A
+> software
+and with the 
+<A
+HREF="http://www.linuxprinting.org/foomatic.html"
+TARGET="_top"
+>Foomatic</A
+> 
+software.
+   </P
+><P
+>Regardless of whether the Gutenprint software is used with the GIMP,
+CUPS, Ghostscript, or Foomatic, the print quality and printer settings
+remain the same.  However, use of the Gutenprint with Ghostscript and
+Foomatic is not covered in this document.  These topics may be covered
+in a future revision of this document.
+  </P
+><P
+>  This document corresponds to version 4.2.0 and later of the Gutenprint
+software. This document will serve as a guide to the user, and as such
+will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
+Foomatic, or any other related software.
+  </P
+><P
+>    Andy Stewart, the author, is the founder of the
+<A
+HREF="http://www.wlug.org"
+TARGET="_top"
+>Worcester Linux Users' Group</A
+> in
+Worcester, Massachusetts, USA.  The group was founded in July 1997 and has
+approximately 140 people on its mailing list.  Monthly meetings are
+held and all are invited.
+  </P
+><P
+>    In terms of "code", this is the author's first contribution to the
+open source community, and definitely his first experience with DocBook.
+Constructive comments, praise, words of encouragement, and the like
+will be most appreciated if e-mailed to the
+<A
+HREF="mailto:andystewart@attbi.com"
+TARGET="_top"
+>author</A
+>.
+  </P
+><P
+></P
+></DIV
+></DIV
+><HR></DIV
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>1. <A
+HREF="c29.html"
+>Project History</A
+></DT
+><DT
+>2. <A
+HREF="ch-gimp-and-gimp-print.html"
+>GIMP and Gutenprint</A
+></DT
+><DD
+><DL
+><DT
+><A
+HREF="ch-gimp-and-gimp-print.html#AEN63"
+>Running the GIMP</A
+></DT
+><DT
+><A
+HREF="x85.html"
+>The Gimp-Print Graphical User Interface</A
+></DT
+><DD
+><DL
+><DT
+><A
+HREF="x85.html#AEN130"
+>Printer Settings</A
+></DT
+><DT
+><A
+HREF="x85.html#AEN230"
+>Preview</A
+></DT
+><DT
+><A
+HREF="x85.html#AEN254"
+>Position</A
+></DT
+><DT
+><A
+HREF="x85.html#AEN326"
+>Size</A
+></DT
+><DT
+><A
+HREF="x85.html#AEN353"
+>Image/Output Settings</A
+></DT
+><DT
+><A
+HREF="x85.html#AEN426"
+>Printing and Saving Settings</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>3. <A
+HREF="c443.html"
+>CUPS and Gutenprint</A
+></DT
+><DD
+><DL
+><DT
+><A
+HREF="c443.html#AEN445"
+>Introduction</A
+></DT
+><DT
+><A
+HREF="x452.html"
+>CUPS Printer Installation</A
+></DT
+><DT
+><A
+HREF="x544.html"
+>Configuring your Printer in CUPS</A
+></DT
+><DT
+><A
+HREF="x559.html"
+>Using CUPS from the Command Line</A
+></DT
+></DL
+></DD
+><DT
+>4. <A
+HREF="c568.html"
+>Gutenprint Utilities</A
+></DT
+><DD
+><DL
+><DT
+><A
+HREF="c568.html#AEN570"
+>escputil</A
+></DT
+><DD
+><DL
+><DT
+><A
+HREF="c568.html#AEN582"
+>Determining Ink Level</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN591"
+>Error During Ink Level Determination</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN595"
+>Nozzle Check</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN600"
+>Clean the Print Head</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN606"
+>Align the Print Head</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN622"
+>Printer Identification</A
+></DT
+><DT
+><A
+HREF="c568.html#AEN626"
+>More Information</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>A. <A
+HREF="gfdl.html"
+>GNU Free Documentation License</A
+></DT
+><DD
+><DL
+><DT
+>0. <A
+HREF="gfdl.html#AEN635"
+>PREAMBLE</A
+></DT
+><DT
+>1. <A
+HREF="x640.html"
+>APPLICABILITY AND DEFINITIONS</A
+></DT
+><DT
+>2. <A
+HREF="x650.html"
+>VERBATIM COPYING</A
+></DT
+><DT
+>3. <A
+HREF="x654.html"
+>COPYING IN QUANTITY</A
+></DT
+><DT
+>4. <A
+HREF="x660.html"
+>MODIFICATIONS</A
+></DT
+><DT
+>5. <A
+HREF="x696.html"
+>COMBINING DOCUMENTS</A
+></DT
+><DT
+>6. <A
+HREF="x701.html"
+>COLLECTIONS OF DOCUMENTS</A
+></DT
+><DT
+>7. <A
+HREF="x705.html"
+>AGGREGATION WITH INDEPENDENT WORKS</A
+></DT
+><DT
+>8. <A
+HREF="x709.html"
+>TRANSLATION</A
+></DT
+><DT
+>9. <A
+HREF="x712.html"
+>TERMINATION</A
+></DT
+><DT
+>10. <A
+HREF="x715.html"
+>FUTURE REVISIONS OF THIS LICENSE</A
+></DT
+><DT
+><A
+HREF="x720.html"
+>How to use this License for your documents</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+><DIV
+CLASS="LOT"
+><DL
+CLASS="LOT"
+><DT
+><B
+>List of Figures</B
+></DT
+><DT
+>2-1. <A
+HREF="ch-gimp-and-gimp-print.html#AEN67"
+>The Startup Window for The GIMP</A
+></DT
+><DT
+>2-2. <A
+HREF="ch-gimp-and-gimp-print.html#AEN78"
+>A Sample Image Displayed by The GIMP</A
+></DT
+><DT
+>2-3. <A
+HREF="x85.html#FIG-GIMP-PRINT-GUI"
+>The Gimp-Print Graphical User Interface 1 (GUI)</A
+></DT
+><DT
+>2-4. <A
+HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
+>The Gimp-Print Graphical User Interface 2 (GUI)</A
+></DT
+><DT
+>2-5. <A
+HREF="x85.html#AEN153"
+>The Setup Printer Window</A
+></DT
+><DT
+>2-6. <A
+HREF="x85.html#AEN168"
+>The New Printer Window</A
+></DT
+><DT
+>2-7. <A
+HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
+>The Print Color Adjust Window</A
+></DT
+><DT
+>3-1. <A
+HREF="x452.html#AEN456"
+>The CUPS Startup Window</A
+></DT
+><DT
+>3-2. <A
+HREF="x452.html#AEN466"
+>The CUPS Printers Window</A
+></DT
+><DT
+>3-3. <A
+HREF="x452.html#AEN475"
+>The CUPS Admin Window</A
+></DT
+><DT
+>3-4. <A
+HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
+>The CUPS Admin Device Window</A
+></DT
+><DT
+>3-5. <A
+HREF="x452.html#AEN494"
+>The CUPS Admin Model/Driver Window</A
+></DT
+><DT
+>3-6. <A
+HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
+>The 2nd CUPS Admin Model/Driver Window</A
+></DT
+><DT
+>3-7. <A
+HREF="x452.html#AEN526"
+>The CUPS Admin Success Window</A
+></DT
+><DT
+>3-8. <A
+HREF="x452.html#FIG-CUPS-MY-PRINTER"
+>The CUPS Window for Your Printer</A
+></DT
+><DT
+>3-9. <A
+HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
+>The CUPS Printer Cofiguration Window</A
+></DT
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="c29.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Project History</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/c29.html b/doc/users_guide/html/c29.html
new file mode 100644
index 0000000..aff4370
--- /dev/null
+++ b/doc/users_guide/html/c29.html
@@ -0,0 +1,260 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Project History</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="PREVIOUS"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="NEXT"
+TITLE="GIMP and Gutenprint"
+HREF="ch-gimp-and-gimp-print.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="CHAPTER"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="book1.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="ch-gimp-and-gimp-print.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="AEN29"
+></A
+>Chapter 1. Project History</H1
+><P
+>This software package was first written by Michael Sweet of
+<A
+HREF="http://www.easysw.com"
+TARGET="_top"
+>Easy Software Products</A
+> and
+initially worked only as a print plugin to the GIMP (GNU Image
+Manipulation Program).  In the summer of 1999,
+Robert Krawitz (the current
+Gutenprint project leader) purchased an Epson Stylus Photo EX printer
+to feed his photography hobby. Finding no existing printer drivers, Robert
+adapted Mike's GIMP Print plugin to his six-color printer, and by the end
+of the year released version 3.0 of the Gimp-Print software, which was
+included in version 1.1 of the GIMP.  The intention was for this to be
+the stable plugin in version 1.2 of the GIMP while development of the
+GIMP Print plugin continued for later release.
+  </P
+><P
+>Robert put the Gimp-Print development tree on SourceForge starting
+with version 3.1, and quickly found a group of like-minded people who wanted to print
+high quality output on inexpensive inkjet printers. One of the main
+goals, which was not expected to be met until late in the version 3.1
+cycle, was to write a Ghostscript driver so that printing would not be
+restricted to the GIMP.  Imagine Robert's surprise when Henryk "Buggs"
+Richter wrote one within days!
+  </P
+><P
+>In July 2000, not more than a year after Robert bought his Epson
+Stylus Photo EX, he was invited to the Linux Printing
+Summit hosted by VA Linux Systems. In preparation for that, he spent
+long hours printing out test images.  Robert went back to the
+Gimp-Print version 3.0.9 release, which seemed like such an advance
+at the time,  and was floored at how far the project had come in four
+months! Output that had been considered impressive with using six
+colors was put to shame by four color output. That should give you
+an idea what six color and variable dot size printers can do. It also
+illustrates what a group of committed people can do.
+  </P
+><P
+>Robert came away from the Printing Summit with a lot of new ideas, and in
+November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
+of work by the team.  The quality was already tremendously improved
+over what the software could do at the Printing Summit.
+  </P
+><P
+>The team started serious work on version 4.1 in December
+2000, and version 4.2.0 was released in November 2001.  Despite the fact
+that version 4.2.0 is a "minor" release over version 4.0, there are vast
+improvements:
+  <P
+></P
+><UL
+><LI
+><P
+>      The driver is built as a shared library, making it much easier
+to use by higher layers of software
+      </P
+></LI
+><LI
+><P
+>      The packaging system now follows GNU standards
+      </P
+></LI
+><LI
+><P
+>The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
+      </P
+></LI
+><LI
+><P
+>      Improved performance
+      </P
+></LI
+><LI
+><P
+>      Many more options
+      </P
+></LI
+><LI
+><P
+>      More supported printers
+      </P
+></LI
+></UL
+>
+
+  </P
+><P
+>Releases of Gimp-Print have been historically numbered in
+a fashion similar to that of the Linux kernel, where major releases
+are denoted by the first digit (in this case '4'), while minor
+releases are denoted by subsequent digits (such as '4.2.0').  Even
+numbered minor releases are considered stable, while odd numbered
+minor releases are considered development releases (whose stability
+may vary for any given release).
+  </P
+><P
+>This project is by no means finished.  In future releases, the development
+team hopes to include the following:
+  <P
+></P
+><UL
+><LI
+><P
+>implementation of proper color management</P
+></LI
+><LI
+><P
+>improved dithering</P
+></LI
+><LI
+><P
+>improvements in performance</P
+></LI
+></UL
+>
+  </P
+><P
+>The entire Gutenprint team hopes you will really enjoy using this
+software!  For more information, please consult the Gutenprint project
+<A
+HREF="http://gimp-print.sourceforge.net"
+TARGET="_top"
+>web page</A
+>.
+  </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="ch-gimp-and-gimp-print.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>The User's Guide to Gutenprint - Complete Edition</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>GIMP and Gutenprint</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/c443.html b/doc/users_guide/html/c443.html
new file mode 100644
index 0000000..20227e8
--- /dev/null
+++ b/doc/users_guide/html/c443.html
@@ -0,0 +1,206 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>CUPS and Gutenprint</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="PREVIOUS"
+TITLE="The Gimp-Print Graphical User Interface"
+HREF="x85.html"><LINK
+REL="NEXT"
+TITLE="CUPS Printer Installation"
+HREF="x452.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="CHAPTER"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x85.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x452.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="AEN443"
+></A
+>Chapter 3. CUPS and Gutenprint</H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+><A
+HREF="c443.html#AEN445"
+>Introduction</A
+></DT
+><DT
+><A
+HREF="x452.html"
+>CUPS Printer Installation</A
+></DT
+><DT
+><A
+HREF="x544.html"
+>Configuring your Printer in CUPS</A
+></DT
+><DT
+><A
+HREF="x559.html"
+>Using CUPS from the Command Line</A
+></DT
+></DL
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN445"
+>Introduction</A
+></H1
+><P
+>       CUPS is an acronym which stands for <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>C</I
+></SPAN
+>ommon
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>U</I
+></SPAN
+>nix <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>P</I
+></SPAN
+>rinting
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>S</I
+></SPAN
+>ystem.  It is assumed that the reader has
+properly installed the CUPS software and the Gutenprint software.
+This section will discuss adding a printer to CUPS that uses a
+Gutenprint printer driver, as well as how to modify the various
+settings supplied by Gutenprint. This will be a rather quick
+explanation, as the CUPS software is quite well documented, and it is
+not my intention to attempt to duplicate the CUPS documentation here.
+     </P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x85.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x452.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>The Gimp-Print Graphical User Interface</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>CUPS Printer Installation</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/c568.html b/doc/users_guide/html/c568.html
new file mode 100644
index 0000000..864e0aa
--- /dev/null
+++ b/doc/users_guide/html/c568.html
@@ -0,0 +1,754 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Gutenprint Utilities</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="PREVIOUS"
+TITLE="Using CUPS from the Command Line"
+HREF="x559.html"><LINK
+REL="NEXT"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="CHAPTER"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x559.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="gfdl.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="AEN568"
+></A
+>Chapter 4. Gutenprint Utilities</H1
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN570"
+>escputil</A
+></H1
+><P
+>       <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> is a command line utility which
+allows the user to perform a variety of maintenance tasks on Epson
+Stylus inkjet printers.  These tasks include head alignment, head
+cleaning, nozzle check, printer identification, and retrieval of the ink
+level from the printer.  In order for many of the
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> functions to work, the user must have
+read/write access to the raw printer device (typically /dev/lp0,
+/dev/usb/lp0, and the like).  In general, these operations should be
+performed by the root user.  As always, the user must insure that the
+directory containing the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> utility is
+listed in the &dollar;PATH environment variable, or that the full path is
+specified on the command line.  The examples in this section will
+assume the former.
+     </P
+><DIV
+CLASS="CAUTION"
+><P
+></P
+><TABLE
+CLASS="CAUTION"
+BORDER="1"
+WIDTH="100%"
+><TR
+><TD
+ALIGN="CENTER"
+><B
+>Caution</B
+></TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+><P
+>       The <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> utility was designed for use
+ONLY with Epson Stylus inkjet printers supported by the Gutenprint
+software.  It is possible that damage MIGHT occur to your printer if
+this utility is misused or if it is used with a printer other than an
+Epson Stylus inkjet printer.  It is the sole responsibility of the
+user to insure that this utility is suitable for the task at hand.
+     </P
+></TD
+></TR
+></TABLE
+></DIV
+><P
+>       In this section, specific examples of common usage will be
+presented.  A summary of the command line switches can be
+found in the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+>(1) man page.
+     </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN582"
+>Determining Ink Level</A
+></H2
+><P
+>       Perhaps the most basic function performed by
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> is that of determining the amount of ink
+remaining in the printer. To do this, the user must know the name of
+the raw printer device.  This is usually /dev/lp0 for a printer
+connected to the parallel port, or /dev/usb/lp0 for a printer
+connected to the USB.  
+     </P
+><P
+>If there are multiple printers connected, one of them may be referenced as
+/dev/lp1 or perhaps /dev/usb/lp1.  In the event of uncertainty, and if
+CUPS is in use, view the following <A
+HREF="http://localhost:631/printers"
+TARGET="_top"
+>URL</A
+> 
+with a web browser. At that URL, look for a line which reads "Device
+URI".  The author's USB printer is listed as "Device URI:  usb:/dev/usb/lp0".
+     </P
+><P
+>For this example, assume that the raw printer device is a USB printer
+specified as /dev/usb/lp0.  To get the ink level for this printer,
+issue this command and notice the output.
+     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -r /dev/usb/lp0 -i
+
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+           Ink color    Percent remaining
+               Black     18
+                Cyan     71
+             Magenta     70
+              Yellow     67
+          Light Cyan     71
+       Light Magenta     70
+    
+  </PRE
+></TD
+></TR
+></TABLE
+><P
+>The user would substitute their own raw printer device for the one
+shown in the example after the "-r" switch.  Notice that the printout
+shows the percent of ink remaining for each color of the author's
+Epson Stylus Photo 870.  When the ink levels get too low, print
+quality will suffer.  In the author's personal experience, ink levels
+approaching 10% begin to cause print quality degredation, but this
+will vary depending on the precise printer model.
+     </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN591"
+>Error During Ink Level Determination</A
+></H2
+><P
+>       What?  The example above did not work?  An error message was
+printed?  What does it mean?  There are several possibilities,
+depending on the specific error message.  If the error message is
+"Invalid argument" (see following example), the problem is that the
+2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
+
+  <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -r /dev/lp0 -i
+
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details.
+
+Cannot read from /dev/lp0: Invalid argument
+    
+  </PRE
+></TD
+></TR
+></TABLE
+>
+
+     Another possibile cause for error is that the raw printer device
+does not have both read and write permission for the user attempting
+to access the device.  In this case, the error message will read
+"Permission denied".  A final possibility is that the raw printer
+device specified is incorrect, in which case the error message will
+read "No such device".
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN595"
+>Nozzle Check</A
+></H2
+><P
+>       On an inkjet printer, there are several small holes on the
+bottom of each ink cartridge through which the ink must flow smoothly
+in order to create high quality images on paper.  If these holes
+become clogged, the printed image will show small gaps where there
+should have been ink.  One can easily test for the existence of this
+condition by running a nozzle check.  One need not be the root user to
+issue this command.  Note that as shown, the command will print a
+nozzle test pattern on the default printer.  If there are multiple
+printers present, the desired printer must be specified with an
+additional "-P printer_name" switch, where "printer_name" is the name
+of the desired printer.
+     </P
+><P
+>       The printer will print a series of black (and colored) slanted
+lines on the paper.  Observe these lines carefully.  If there are gaps
+or spaces in these lines, then the corresponding nozzle is clogged and
+the print head must be cleaned.  However, if there are no gaps, the 
+nozzles are clean.
+     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -n       
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+Running nozzle check, please ensure paper is in the printer.
+    
+  </PRE
+></TD
+></TR
+></TABLE
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN600"
+>Clean the Print Head</A
+></H2
+><P
+>       If the printed output is showing gaps where there should have
+been ink, it is likely that one or more nozzles are clogged and the
+print head is in need of cleaning.  One can verify this by first
+running a nozzle check and looking for gaps in the printout.  To clean
+the print head, issue the following command.  One need not be the root user to
+issue this command.  Note that as shown, the command will clean the
+print head on the default printer.  If there are multiple
+printers present, the desired printer must be specified with an
+additional "-P printer_name" switch, where "printer_name" is the name
+of the desired printer.
+     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -c
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+Cleaning heads...
+    
+  </PRE
+></TD
+></TR
+></TABLE
+><P
+>       Nothing will be printed on the paper.  The printer will make
+some noise as it cleans the print head.  Wait until the printer is
+finished cleaning the print head.  Afterwards, execute another nozzle
+check and insure that the print head is indeed completely clean.  Note
+that the process of cleaning the print head causes ink consumption, so
+do not clean the print head any more than necessary.
+     </P
+><P
+>For severely clogged nozzles, one may have to execute two or three cycles
+of nozzle check followed by a cleaning of the print head.  If the
+printer had gone unused for a long time, the nozzles may be so clogged
+with dried ink as to be unrecoverable, in which case, the best course
+of action is to replace the ink cartridge.
+     </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN606"
+>Align the Print Head</A
+></H2
+><P
+>       To insure the highest quality printouts, the print head must
+be in proper physical alignment.  One can check and realign the print
+head by running this interactive alignment test.  
+     </P
+><P
+>The <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> utility must know the exact printer model in
+use.  One may specify the model on the command line using the "-m"
+switch, or the utility can detect the printer model if the user passes
+the "-r" switch and the name of the raw printer device.  
+     </P
+><P
+>Note that an unprivileged user may use this command with the "-m" switch, but that
+(in general) the root user may only use the "-r" switch (which
+requires read/write access to the raw printer device).  In the case of
+multiple printers in use, the "-P" switch is required to align the
+print head on the non-default printer.
+     </P
+><DIV
+CLASS="CAUTION"
+><P
+></P
+><TABLE
+CLASS="CAUTION"
+BORDER="1"
+WIDTH="100%"
+><TR
+><TD
+ALIGN="CENTER"
+><B
+>Caution</B
+></TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+><P
+>This utility lets you align the print head of your Epson Stylus inkjet
+printer.  Misuse of this utility may cause your print quality to degrade
+and possibly damage your printer.  This utility has not been reviewed by
+Seiko Epson for correctness, and is offered with no warranty at all.  The
+entire risk of using this utility lies with you.
+     </P
+></TD
+></TR
+></TABLE
+></DIV
+><P
+>       Aligning the print head is an interactive process.  The utility
+will print out a set of instructions and ask you for responses.  Please
+read the instructions carefully and follow them precisely.  A single
+sheet of paper will be needed (one can print on both sides to save paper).
+     </P
+><P
+>The following example illustrates the alignment process when issued by an
+unprivileged user who specified the printer model on the command
+line.  (To obtain a list of printer models, issue the "escputil -M"
+command).  Of course, your responses will vary and should be
+substituted for the responses shown in the following example.
+     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+
+*** NOTE - 870 is an illustrative example! ***
+*** You MUST use the proper printer model! ***
+*** Run:  escputil -M for a listing of     ***
+*** supported printer models!              ***
+
+linuxpc&#62; escputil -a -m 870
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Please read these instructions very carefully before proceeding.
+
+This utility lets you align the print head of your Epson Stylus 
+inkjet printer.  Misuse of this utility may cause your print 
+quality to degrade and possibly damage your printer.  This utility
+has not been reviewed by Seiko Epson for correctness, and is 
+offered with no warranty at all.  The entire risk of using this 
+utility lies with you.
+
+This utility prints 3 test patterns.  Each pattern looks very
+similar.  The patterns consist of a series of pairs of vertical
+lines that overlap.  Below each pair of lines is a number between 
+1 and 15.
+
+When you inspect the pairs of lines, you should find the pair
+of lines that is best in alignment, that is, that best forms 
+a single vertical line.  Inspect the pairs very carefully to 
+find the best match.  Using a loupe or magnifying glass is 
+recommended for the most critical inspection.  It is also 
+suggested that you use a good quality paper for the test, so 
+that the lines are well-formed and do not spread through the 
+paper.  After picking the number matching the best pair, place 
+the paper back in the paper input tray before typing it in.
+
+Each pattern is similar, but later patterns use finer dots for
+more critical alignment.  You must run all of the passes to 
+correctly align your printer.  After running all the alignment
+passes, the alignment patterns will be printed once more.  You 
+should find that the middle-most pair (#8 out of the 15) is the
+best for all patterns. 
+
+After the passes are printed once more, you will be offered the
+choices of (s)aving the result in the printer, (r)epeating the
+process, or (q)uitting without saving.  Quitting will not restore
+the previous settings, but powering the printer off and back 
+on will.  If you quit, you must repeat the entire process if 
+you wish to later save the results.  It is essential that you 
+not turn your printer off during this procedure.
+
+This procedure assumes that your printer is an Epson Stylus Photo
+870.  If this is not your printer model, please type control-C now
+and choose your actual printer model.
+
+Please place a sheet of paper in your printer to begin the head
+alignment procedure. 
+Press enter to continue &#62; 
+Please inspect the print, and choose the best pair of lines in 
+each pattern.  Type a pair number, '?' for help, or 'r' to repeat
+the procedure.
+Pass #1&#62; 8
+Pass #2&#62; 8
+Pass #3&#62; 8
+Attempting to set alignment...succeeded.
+Please verify that the alignment is correct.  After the alignment
+pattern is printed again, please ensure that the best pattern 
+for each line is pattern 8.  If it is not, you should repeat the 
+process to get the best quality printing. 
+Please insert a fresh sheet of paper.
+Press enter to continue &#62; 
+Please inspect the final output very carefully to ensure that your
+printer is in proper alignment. You may now: 
+  (s)ave the results in the printer,
+  (q)uit without saving the results, or
+  (r)epeat the entire process from the beginning.
+You will then be asked to confirm your choice.
+What do you want to do (s, q, r)?
+&#62; s
+This will permanently alter the configuration of your printer.
+WARNING: this procedure has not been approved by Seiko Epson, 
+and it may damage your printer. Proceed? 
+Please confirm by typing 's' again that you wish to save the 
+settings to your printer: 
+&#62; s
+About to save settings...succeeded!
+Your alignment settings have been saved to the printer.
+    
+  </PRE
+></TD
+></TR
+></TABLE
+><P
+>      The following example shows what will happen if an unprivileged
+user attempts to align the print head by specifying the raw printer
+device on the command line.
+    </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+linuxpc&#62; escputil -a -r /dev/usb/lp0
+Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Attempting to detect printer model...
+Cannot open /dev/usb/lp0 read/write: Permission denied
+    
+  </PRE
+></TD
+></TR
+></TABLE
+><P
+>      This next example illustrates the results obtained when the root
+user issues an alignment command while specifying the raw printer
+device.  Note that the output is truncated and only shows the printer
+detection output.
+    </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -a -r /dev/usb/lp0
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Attempting to detect printer model...Stylus Photo 870
+
+Please read these instructions very carefully before proceeding.
+    
+  </PRE
+></TD
+></TR
+></TABLE
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN622"
+>Printer Identification</A
+></H2
+><P
+>       The printer identification command will query the printer for
+make and model information.  This command requires read/write access
+to the raw printer device (generally limited to the root user).
+Substitute your own raw printer device in place of the /dev/usb/lp0
+shown in the example.  The output will vary depending on the precise
+printer model.
+     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+# escputil -d -r /dev/usb/lp0
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+@EJL ID
+MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
+EPSON Stylus Photo 870;
+    
+  </PRE
+></TD
+></TR
+></TABLE
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN626"
+>More Information</A
+></H2
+><P
+>       For more detailed information about the command line switches
+accepted by the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>escputil</I
+></SPAN
+> utility, please consult
+the man page which is supplied with the Gutenprint software.  The user
+may also issue the "escputil --help" command to get a listing of supported
+command line switches.  The command requires no special privileges to execute.
+     </P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x559.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Using CUPS from the Command Line</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>GNU Free Documentation License</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/ch-gimp-and-gimp-print.html b/doc/users_guide/html/ch-gimp-and-gimp-print.html
new file mode 100644
index 0000000..174f782
--- /dev/null
+++ b/doc/users_guide/html/ch-gimp-and-gimp-print.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>GIMP and Gutenprint</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="PREVIOUS"
+TITLE="Project History"
+HREF="c29.html"><LINK
+REL="NEXT"
+TITLE="The Gimp-Print Graphical User Interface"
+HREF="x85.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="CHAPTER"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="c29.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x85.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="CH-GIMP-AND-GIMP-PRINT"
+></A
+>Chapter 2. GIMP and Gutenprint</H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+><A
+HREF="ch-gimp-and-gimp-print.html#AEN63"
+>Running the GIMP</A
+></DT
+><DT
+><A
+HREF="x85.html"
+>The Gimp-Print Graphical User Interface</A
+></DT
+></DL
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN63"
+>Running the GIMP</A
+></H1
+><P
+>   This section assumes that you have the GIMP version 1.2 installed
+and working properly on your computer, and that you have an image of
+some type that you desire to print. To get started quickly, log into
+your system, start the X window system, and bring up your favorite terminal
+window.  At the $ prompt, type:
+
+  <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>  
+     $ gimp &#38;
+    
+  </PRE
+></TD
+></TR
+></TABLE
+>
+
+   This should start the GIMP for you. If it does not, check that
+you have installed the GIMP properly, and that its binary is located
+in one of the directories listed in your &dollar;PATH environment
+variable. On the assumption that this worked, the screen should now
+look something like this:
+
+   <DIV
+CLASS="FIGURE"
+><A
+NAME="AEN67"
+></A
+><P
+><B
+>Figure 2-1. The Startup Window for The GIMP</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp_startup.png"></P
+></DIV
+></DIV
+>
+
+   </P
+><P
+>   At this point, you should use the
+
+    <SPAN
+CLASS="GUIMENU"
+>File</SPAN
+>-&gt;<SPAN
+CLASS="GUIMENUITEM"
+>Open</SPAN
+>
+
+menu option to open your favorite picture. We will print this picture
+shortly. Your picture should be displayed next to the GIMP startup
+window, perhaps looking similar to the following (sssh! Don't tell
+anybody the secret!):
+
+   <DIV
+CLASS="FIGURE"
+><A
+NAME="AEN78"
+></A
+><P
+><B
+>Figure 2-2. A Sample Image Displayed by The GIMP</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp_image.png"></P
+></DIV
+></DIV
+>
+
+  </P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="c29.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x85.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Project History</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>The Gimp-Print Graphical User Interface</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/docbook.css b/doc/users_guide/html/docbook.css
new file mode 100644
index 0000000..0f90516
--- /dev/null
+++ b/doc/users_guide/html/docbook.css
@@ -0,0 +1,12 @@
+.NAVHEADER { display: none }
+.NAVFOOTER { display: none }
+.TOC       { display: none }
+
+.NAVTOC    { margin-left: 15;
+             display: none }
+
+.NAVBTN    { font-size: 10pt }
+
+.TOCTITLE  { font-size: 10pt;
+             color: blue;
+ 	     text-decoration: underline; }
diff --git a/doc/users_guide/html/gfdl.html b/doc/users_guide/html/gfdl.html
new file mode 100644
index 0000000..78d79fd
--- /dev/null
+++ b/doc/users_guide/html/gfdl.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>GNU Free Documentation License</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="PREVIOUS"
+TITLE="Gutenprint Utilities"
+HREF="c568.html"><LINK
+REL="NEXT"
+TITLE="APPLICABILITY AND DEFINITIONS"
+HREF="x640.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="APPENDIX"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="c568.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x640.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="APPENDIX"
+><H1
+><A
+NAME="GFDL"
+></A
+>Appendix A. GNU Free Documentation License</H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>0. <A
+HREF="gfdl.html#AEN635"
+>PREAMBLE</A
+></DT
+><DT
+>1. <A
+HREF="x640.html"
+>APPLICABILITY AND DEFINITIONS</A
+></DT
+><DT
+>2. <A
+HREF="x650.html"
+>VERBATIM COPYING</A
+></DT
+><DT
+>3. <A
+HREF="x654.html"
+>COPYING IN QUANTITY</A
+></DT
+><DT
+>4. <A
+HREF="x660.html"
+>MODIFICATIONS</A
+></DT
+><DT
+>5. <A
+HREF="x696.html"
+>COMBINING DOCUMENTS</A
+></DT
+><DT
+>6. <A
+HREF="x701.html"
+>COLLECTIONS OF DOCUMENTS</A
+></DT
+><DT
+>7. <A
+HREF="x705.html"
+>AGGREGATION WITH INDEPENDENT WORKS</A
+></DT
+><DT
+>8. <A
+HREF="x709.html"
+>TRANSLATION</A
+></DT
+><DT
+>9. <A
+HREF="x712.html"
+>TERMINATION</A
+></DT
+><DT
+>10. <A
+HREF="x715.html"
+>FUTURE REVISIONS OF THIS LICENSE</A
+></DT
+><DT
+><A
+HREF="x720.html"
+>How to use this License for your documents</A
+></DT
+></DL
+></DIV
+><P
+>Version 1.1, March 2000</P
+><A
+NAME="AEN633"
+></A
+><BLOCKQUOTE
+CLASS="BLOCKQUOTE"
+><P
+>Copyright (C) 2000  Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.</P
+></BLOCKQUOTE
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN635"
+>0. PREAMBLE</A
+></H1
+><P
+>The purpose of this License is to make a manual, textbook,
+    or other written document "free" in the sense of freedom: to
+    assure everyone the effective freedom to copy and redistribute it,
+    with or without modifying it, either commercially or
+    noncommercially.  Secondarily, this License preserves for the
+    author and publisher a way to get credit for their work, while not
+    being considered responsible for modifications made by
+    others.</P
+><P
+>This License is a kind of "copyleft", which means that
+    derivative works of the document must themselves be free in the
+    same sense.  It complements the GNU General Public License, which
+    is a copyleft license designed for free software.</P
+><P
+>We have designed this License in order to use it for manuals
+    for free software, because free software needs free documentation:
+    a free program should come with manuals providing the same
+    freedoms that the software does.  But this License is not limited
+    to software manuals; it can be used for any textual work,
+    regardless of subject matter or whether it is published as a
+    printed book.  We recommend this License principally for works
+    whose purpose is instruction or reference.</P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="c568.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x640.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Gutenprint Utilities</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>APPLICABILITY AND DEFINITIONS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/ln12.html b/doc/users_guide/html/ln12.html
new file mode 100644
index 0000000..ae1606e
--- /dev/null
+++ b/doc/users_guide/html/ln12.html
@@ -0,0 +1,93 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="NEXT"
+TITLE="Project History"
+HREF="c29.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="LEGALNOTICE"
+><P
+></P
+><A
+NAME="AEN12"
+></A
+><P
+>The User's Guide to Gutenprint - Complete Edition,
+Copyright 2002, Andy Stewart. 
+    </P
+><P
+>    Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation with no invariant sections, no Front-Cover texts, and no
+Back-Cover texts.  A copy of the license is included in <A
+HREF="gfdl.html"
+>Appendix A</A
+>.
+    </P
+><P
+></P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/stylesheet-images/caution.gif b/doc/users_guide/html/stylesheet-images/caution.gif
new file mode 100644
index 0000000..9cc2e15
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/caution.gif
diff --git a/doc/users_guide/html/stylesheet-images/home.gif b/doc/users_guide/html/stylesheet-images/home.gif
new file mode 100644
index 0000000..55e1d59
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/home.gif
diff --git a/doc/users_guide/html/stylesheet-images/important.gif b/doc/users_guide/html/stylesheet-images/important.gif
new file mode 100644
index 0000000..25e40c7
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/important.gif
diff --git a/doc/users_guide/html/stylesheet-images/next.gif b/doc/users_guide/html/stylesheet-images/next.gif
new file mode 100644
index 0000000..8c502e7
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/next.gif
diff --git a/doc/users_guide/html/stylesheet-images/note.gif b/doc/users_guide/html/stylesheet-images/note.gif
new file mode 100644
index 0000000..7322e8e
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/note.gif
diff --git a/doc/users_guide/html/stylesheet-images/prev.gif b/doc/users_guide/html/stylesheet-images/prev.gif
new file mode 100644
index 0000000..0894d9e
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/prev.gif
diff --git a/doc/users_guide/html/stylesheet-images/tip.gif b/doc/users_guide/html/stylesheet-images/tip.gif
new file mode 100644
index 0000000..f062955
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/tip.gif
diff --git a/doc/users_guide/html/stylesheet-images/toc-blank.gif b/doc/users_guide/html/stylesheet-images/toc-blank.gif
new file mode 100644
index 0000000..6c65e3a
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/toc-blank.gif
diff --git a/doc/users_guide/html/stylesheet-images/toc-minus.gif b/doc/users_guide/html/stylesheet-images/toc-minus.gif
new file mode 100644
index 0000000..40ebe61
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/toc-minus.gif
diff --git a/doc/users_guide/html/stylesheet-images/toc-plus.gif b/doc/users_guide/html/stylesheet-images/toc-plus.gif
new file mode 100644
index 0000000..3e9e7d5
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/toc-plus.gif
diff --git a/doc/users_guide/html/stylesheet-images/up.gif b/doc/users_guide/html/stylesheet-images/up.gif
new file mode 100644
index 0000000..e899a27
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/up.gif
diff --git a/doc/users_guide/html/stylesheet-images/warning.gif b/doc/users_guide/html/stylesheet-images/warning.gif
new file mode 100644
index 0000000..a587079
--- /dev/null
+++ b/doc/users_guide/html/stylesheet-images/warning.gif
diff --git a/doc/users_guide/html/x452.html b/doc/users_guide/html/x452.html
new file mode 100644
index 0000000..773549f
--- /dev/null
+++ b/doc/users_guide/html/x452.html
@@ -0,0 +1,456 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>CUPS Printer Installation</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="CUPS and Gutenprint"
+HREF="c443.html"><LINK
+REL="PREVIOUS"
+TITLE="CUPS and Gutenprint"
+HREF="c443.html"><LINK
+REL="NEXT"
+TITLE="Configuring your Printer in CUPS"
+HREF="x544.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="c443.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 3. CUPS and Gutenprint</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x544.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN452"
+>CUPS Printer Installation</A
+></H1
+><P
+>This explanation will use the web interface provided by CUPS. First,
+aim your favorite web browser at
+<A
+HREF="http://localhost:631"
+TARGET="_top"
+>the CUPS server</A
+>.  The
+following screen should appear within your browser.
+    </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="AEN456"
+></A
+><P
+><B
+>Figure 3-1. The CUPS Startup Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_startup.png"></P
+></DIV
+></DIV
+><P
+>Now, you may click on either the word <SPAN
+CLASS="GUILABEL"
+>Printers</SPAN
+> in the bar at the top
+of the page, or you may click on the <SPAN
+CLASS="GUILABEL"
+>Manage Printers</SPAN
+> text.  In
+either case, the next screen you see will look like this one if you
+have not yet configured any printers.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="AEN466"
+></A
+><P
+><B
+>Figure 3-2. The CUPS Printers Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_printers.png"></P
+></DIV
+></DIV
+><P
+>At this time, click on the <SPAN
+CLASS="GUIBUTTON"
+>Add Printer</SPAN
+> button.
+You will then see the Admin screen (shown below).
+    </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="AEN475"
+></A
+><P
+><B
+>Figure 3-3. The CUPS Admin Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_admin.png"></P
+></DIV
+></DIV
+><P
+>Notice in the screenshot that the three boxes are shown after the
+author filled them in for his printer at home.  You will need to fill
+in an appropriate name of your printer, its location, and a
+description which meets your own needs.  Once this is done, click on
+the <SPAN
+CLASS="GUIBUTTON"
+>Continue</SPAN
+> button, and then this screen will appear.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-CUPS-ADMIN-DEVICE"
+></A
+><P
+><B
+>Figure 3-4. The CUPS Admin Device Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_admin_device.png"></P
+></DIV
+></DIV
+><P
+>Click on the drop down menu next to the word
+<SPAN
+CLASS="GUILABEL"
+>Device</SPAN
+> and a list of possible printer devices
+appears.  Select the device appropriate for your printer.  Note that
+there are a range of serial, parallel, USB, and other devices from
+which to choose.  Once the selection is made, click the
+<SPAN
+CLASS="GUIBUTTON"
+>Continue</SPAN
+> button.  Now, this screen appears.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="AEN494"
+></A
+><P
+><B
+>Figure 3-5. The CUPS Admin Model/Driver Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_admin_make.png"></P
+></DIV
+></DIV
+><DIV
+CLASS="CAUTION"
+><P
+></P
+><TABLE
+CLASS="CAUTION"
+BORDER="1"
+WIDTH="100%"
+><TR
+><TD
+ALIGN="CENTER"
+><B
+>Caution Regarding USB Printers</B
+></TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+><P
+>CUPS versions 1.1.11 and later <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>REQUIRE</I
+></SPAN
+>
+the user to insure that the desired USB printer is powered on
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>AND</I
+></SPAN
+> physically connected to the USB bus
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>BEFORE</I
+></SPAN
+> starting the CUPS software.  
+   </P
+><P
+>CUPS must see the USB printer when the software starts.  The CUPS software
+is typically started when the computer boots.  Note that one cannot
+simply plug in the USB printer and power it on after CUPS has started.
+(Note that this does not apply to parallel port printers).
+   </P
+><P
+>If the USB printer was not connected and powered on at the time CUPS was
+started, there will not be a USB printer shown in the
+list of devices on the CUPS Admin Device Window (see 
+<A
+HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
+>Figure 3-4</A
+>).  In this event, stop the CUPS
+software, properly connect and power on the USB printer, and restart
+the CUPS software.
+   </P
+><P
+>From the list of devices shown in the CUPS Admin Device Window
+(see <A
+HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
+>Figure 3-4</A
+>), a clever user might
+attempt to avoid this issue by selecting 
+<SPAN
+CLASS="GUIMENUITEM"
+>Internet Printing Protocol</SPAN
+> 
+and then enter something similar to 'usb:/dev/usblp0' in the next
+screen.  However, this fails later in the configuration process with a
+"client_error_not_possible" error message with no other explanation.
+Note that entering 'file:/dev/usblp0' will not work either. While CUPS
+will allow this, printing will not actually work in some situations.
+   </P
+><P
+>CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
+to not displaying the USB printer if it was not connected to the USB
+bus and powered up prior to starting the CUPS software.  However,
+these versions of CUPS will indeed allow the user to enter the name of
+the USB connection, unlike versions 1.1.11 and later.
+   </P
+></TD
+></TR
+></TABLE
+></DIV
+><P
+>Select the manufacturer of your printer and click the
+<SPAN
+CLASS="GUIBUTTON"
+>Continue</SPAN
+> button.  A window will appear which
+asks you to select the specific model number for your printer.
+   </P
+><P
+>Scroll through the long list and find the model number for your
+printer.  Notice carefully that there are many different languages
+supported for each printer, as denoted by the initials in parenthesis.
+(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
+French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
+English (see <A
+HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
+>Figure 3-6</A
+>).  Also take note
+of the Gutenprint revision for the driver, and ensure that it is
+indeed the version of Gutenprint which you have most recently
+installed.  Once you have made the proper selection, click on the
+<SPAN
+CLASS="GUIBUTTON"
+>Continue</SPAN
+> button. 
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-CUPS-ADMIN-MODEL"
+></A
+><P
+><B
+>Figure 3-6. The 2nd CUPS Admin Model/Driver Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_admin_model.png"></P
+></DIV
+></DIV
+><DIV
+CLASS="FIGURE"
+><A
+NAME="AEN526"
+></A
+><P
+><B
+>Figure 3-7. The CUPS Admin Success Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_admin_success.png"></P
+></DIV
+></DIV
+><P
+>Congratulations!  You should now see the CUPS window indicating that
+your printer was successfully installed.  Notice the sentence which
+reads "Printer your_printer has been added successfully".  Click on
+your_printer, which will be the underlined name for your printer.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-CUPS-MY-PRINTER"
+></A
+><P
+><B
+>Figure 3-8. The CUPS Window for Your Printer</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_my_printer.png"></P
+></DIV
+></DIV
+><P
+>After clicking on your_printer (epson_870 in this example), a window
+will appear similar to that shown in <A
+HREF="x452.html#FIG-CUPS-MY-PRINTER"
+>Figure 3-8</A
+>.
+It would probably be a good idea at this point to click on the
+<SPAN
+CLASS="GUIBUTTON"
+>Print Test Page</SPAN
+> button to ensure that
+everything is working properly.  Take note of the Gutenprint revision
+printed on this screen and confirm once again that it is the expected
+revision.
+   </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="c443.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x544.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>CUPS and Gutenprint</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="c443.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Configuring your Printer in CUPS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x544.html b/doc/users_guide/html/x544.html
new file mode 100644
index 0000000..d87c348
--- /dev/null
+++ b/doc/users_guide/html/x544.html
@@ -0,0 +1,193 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Configuring your Printer in CUPS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="CUPS and Gutenprint"
+HREF="c443.html"><LINK
+REL="PREVIOUS"
+TITLE="CUPS Printer Installation"
+HREF="x452.html"><LINK
+REL="NEXT"
+TITLE="Using CUPS from the Command Line"
+HREF="x559.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x452.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 3. CUPS and Gutenprint</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x559.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN544"
+>Configuring your Printer in CUPS</A
+></H1
+><P
+>With reference to <A
+HREF="x452.html#FIG-CUPS-MY-PRINTER"
+>Figure 3-8</A
+>, click
+on the <SPAN
+CLASS="GUIBUTTON"
+>Configure Printer</SPAN
+> button.  A partial
+screenshot of the printer configuration window appears in
+<A
+HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
+>Figure 3-9</A
+>.
+The contents of this window will vary depending on precisely which
+printer you selected when you configured CUPS for your printer.  The
+screenshot shows the selections made by the author for his printer.
+The individual selections will not be explained in detail here, as
+they are the same selections which are available when using the
+Gutenprint plugin to the GIMP.  These selections are explained in
+detail in various sections of the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>GIMP and
+Gutenprint</I
+></SPAN
+> chapter of <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>The User's Guide to the
+Gutenprint Top Quality Printer Drivers</I
+></SPAN
+>.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-CUPS-PRINTER-CONFIG-WINDOW"
+></A
+><P
+><B
+>Figure 3-9. The CUPS Printer Cofiguration Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/cups_config_printer.png"></P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x452.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x559.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>CUPS Printer Installation</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="c443.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Using CUPS from the Command Line</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x559.html b/doc/users_guide/html/x559.html
new file mode 100644
index 0000000..c0161f1
--- /dev/null
+++ b/doc/users_guide/html/x559.html
@@ -0,0 +1,233 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Using CUPS from the Command Line</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="CUPS and Gutenprint"
+HREF="c443.html"><LINK
+REL="PREVIOUS"
+TITLE="Configuring your Printer in CUPS"
+HREF="x544.html"><LINK
+REL="NEXT"
+TITLE="Gutenprint Utilities"
+HREF="c568.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x544.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 3. CUPS and Gutenprint</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="c568.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN559"
+>Using CUPS from the Command Line</A
+></H1
+><P
+>    It is possible to use the CUPS printing system from the command
+line.  While this document will not delve into all of the specifics of
+the CUPS command line interface, there are portions of this interface
+which are specific to the Gutenprint software.
+   </P
+><P
+>The command line is in some cases a more convenient way to generate
+printed output (e.g. when printing from a script).  However, most
+people (including the author) cannot easily predict what a command
+line option of "-o stpCyan=1350" will do to the output.  It is
+therefore a good idea to use the GIMP to view the image and the
+Gutenprint plugin to preview these settings before relying on the
+command line.
+   </P
+><P
+>When using CUPS from the command line, the command will have this
+general format:
+
+   <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>   
+     lpr -P my_printer_name \
+         -o option1=&#60;choice1&#62; \
+         -o option2=&#60;choice2&#62; \
+         /path/to/printfile
+     
+   </PRE
+></TD
+></TR
+></TABLE
+>
+
+When typing the command directly onto the command line, put all of the
+command line options on one line, and do not type the "\" characters.
+The list of possible options which are specific to Gutenprint,
+followed by some of the supported choices, are shown below:
+
+   <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>   
+   -o PageSize=&#60;...| A3 | A4 | A4 | ...&#62;
+   -o InputSlot=&#60;Roll | Standard&#62;
+   -o MediaType=&#60; ..| Inkjet | Plain | GlossyPaper | ...&#62;
+   -o Resolution=&#60;360sw | 360swuni ...| 1440x720 &#62;
+   -o ColorModel=&#60;Black | RGB | Gray | CMYK&#62;
+   -o stpBrightness=&#60;0...2000&#62;
+   -o stpContrast=&#60;0...2000&#62;
+   -o stpCyan=&#60;0...4000&#62;
+   -o stpDensity=&#60;0...2000&#62;
+   -o stpDither=&#60;0...4000&#62;
+   -o stpGamma=&#60;0...4000&#62;
+   -o stpImageType=&#60;LineArt | Continuous | SolidTone&#62;
+   -o stpInkType=&#60;PhotoCMY | CMYK | PhotoCMYK | RGB&#62;
+   -o stpMagenta=&#60;0...4000&#62;
+   -o stpSaturation=&#60;0...9000&#62;
+   -o stpYellow=&#60;0...4000&#62;
+   
+   </PRE
+></TD
+></TR
+></TABLE
+>
+
+For more detailed information, consult the appropriate sections of the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>GIMP and
+Gutenprint</I
+></SPAN
+> chapter of <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>The User's Guide to the
+Gutenprint Top Quality Printer Drivers</I
+></SPAN
+>.
+   </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x544.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="c568.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Configuring your Printer in CUPS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="c443.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Gutenprint Utilities</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x640.html b/doc/users_guide/html/x640.html
new file mode 100644
index 0000000..d7b2844
--- /dev/null
+++ b/doc/users_guide/html/x640.html
@@ -0,0 +1,205 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>APPLICABILITY AND DEFINITIONS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="NEXT"
+TITLE="VERBATIM COPYING"
+HREF="x650.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="gfdl.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x650.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN640"
+>1. APPLICABILITY AND DEFINITIONS</A
+></H1
+><P
+>This License applies to any manual or other work that
+    contains a notice placed by the copyright holder saying it can be
+    distributed under the terms of this License.  The "Document",
+    below, refers to any such manual or work.  Any member of the
+    public is a licensee, and is addressed as "you".</P
+><P
+>A "Modified Version" of the Document means any work
+    containing the Document or a portion of it, either copied
+    verbatim, or with modifications and/or translated into another
+    language.</P
+><P
+>A "Secondary Section" is a named appendix or a front-matter
+    section of the Document that deals exclusively with the
+    relationship of the publishers or authors of the Document to the
+    Document's overall subject (or to related matters) and contains
+    nothing that could fall directly within that overall subject.
+    (For example, if the Document is in part a textbook of
+    mathematics, a Secondary Section may not explain any mathematics.)
+    The relationship could be a matter of historical connection with
+    the subject or with related matters, or of legal, commercial,
+    philosophical, ethical or political position regarding
+    them.</P
+><P
+>The "Invariant Sections" are certain Secondary Sections
+    whose titles are designated, as being those of Invariant Sections,
+    in the notice that says that the Document is released under this
+    License.</P
+><P
+>The "Cover Texts" are certain short passages of text that
+    are listed, as Front-Cover Texts or Back-Cover Texts, in the
+    notice that says that the Document is released under this
+    License.</P
+><P
+>A "Transparent" copy of the Document means a
+    machine-readable copy, represented in a format whose specification
+    is available to the general public, whose contents can be viewed
+    and edited directly and straightforwardly with generic text
+    editors or (for images composed of pixels) generic paint programs
+    or (for drawings) some widely available drawing editor, and that
+    is suitable for input to text formatters or for automatic
+    translation to a variety of formats suitable for input to text
+    formatters.  A copy made in an otherwise Transparent file format
+    whose markup has been designed to thwart or discourage subsequent
+    modification by readers is not Transparent.  A copy that is not
+    "Transparent" is called "Opaque".</P
+><P
+>Examples of suitable formats for Transparent copies include
+    plain ASCII without markup, Texinfo input format, LaTeX input
+    format, SGML or XML using a publicly available DTD, and
+    standard-conforming simple HTML designed for human modification.
+    Opaque formats include PostScript, PDF, proprietary formats that
+    can be read and edited only by proprietary word processors, SGML
+    or XML for which the DTD and/or processing tools are not generally
+    available, and the machine-generated HTML produced by some word
+    processors for output purposes only.</P
+><P
+>The "Title Page" means, for a printed book, the title page
+    itself, plus such following pages as are needed to hold, legibly,
+    the material this License requires to appear in the title page.
+    For works in formats which do not have any title page as such,
+    "Title Page" means the text near the most prominent appearance of
+    the work's title, preceding the beginning of the body of the
+    text.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x650.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>GNU Free Documentation License</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>VERBATIM COPYING</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x650.html b/doc/users_guide/html/x650.html
new file mode 100644
index 0000000..404839f
--- /dev/null
+++ b/doc/users_guide/html/x650.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>VERBATIM COPYING</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="APPLICABILITY AND DEFINITIONS"
+HREF="x640.html"><LINK
+REL="NEXT"
+TITLE="COPYING IN QUANTITY"
+HREF="x654.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x640.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x654.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN650"
+>2. VERBATIM COPYING</A
+></H1
+><P
+>You may copy and distribute the Document in any medium,
+    either commercially or noncommercially, provided that this
+    License, the copyright notices, and the license notice saying this
+    License applies to the Document are reproduced in all copies, and
+    that you add no other conditions whatsoever to those of this
+    License.  You may not use technical measures to obstruct or
+    control the reading or further copying of the copies you make or
+    distribute.  However, you may accept compensation in exchange for
+    copies.  If you distribute a large enough number of copies you
+    must also follow the conditions in section 3.</P
+><P
+>You may also lend copies, under the same conditions stated
+    above, and you may publicly display copies.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x640.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x654.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>APPLICABILITY AND DEFINITIONS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>COPYING IN QUANTITY</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x654.html b/doc/users_guide/html/x654.html
new file mode 100644
index 0000000..07a86e9
--- /dev/null
+++ b/doc/users_guide/html/x654.html
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>COPYING IN QUANTITY</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="VERBATIM COPYING"
+HREF="x650.html"><LINK
+REL="NEXT"
+TITLE="MODIFICATIONS"
+HREF="x660.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x650.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x660.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN654"
+>3. COPYING IN QUANTITY</A
+></H1
+><P
+>If you publish printed copies of the Document numbering more
+    than 100, and the Document's license notice requires Cover Texts,
+    you must enclose the copies in covers that carry, clearly and
+    legibly, all these Cover Texts: Front-Cover Texts on the front
+    cover, and Back-Cover Texts on the back cover.  Both covers must
+    also clearly and legibly identify you as the publisher of these
+    copies.  The front cover must present the full title with all
+    words of the title equally prominent and visible.  You may add
+    other material on the covers in addition.  Copying with changes
+    limited to the covers, as long as they preserve the title of the
+    Document and satisfy these conditions, can be treated as verbatim
+    copying in other respects.</P
+><P
+>If the required texts for either cover are too voluminous to
+    fit legibly, you should put the first ones listed (as many as fit
+    reasonably) on the actual cover, and continue the rest onto
+    adjacent pages.</P
+><P
+>If you publish or distribute Opaque copies of the Document
+    numbering more than 100, you must either include a
+    machine-readable Transparent copy along with each Opaque copy, or
+    state in or with each Opaque copy a publicly-accessible
+    computer-network location containing a complete Transparent copy
+    of the Document, free of added material, which the general
+    network-using public has access to download anonymously at no
+    charge using public-standard network protocols.  If you use the
+    latter option, you must take reasonably prudent steps, when you
+    begin distribution of Opaque copies in quantity, to ensure that
+    this Transparent copy will remain thus accessible at the stated
+    location until at least one year after the last time you
+    distribute an Opaque copy (directly or through your agents or
+    retailers) of that edition to the public.</P
+><P
+>It is requested, but not required, that you contact the
+    authors of the Document well before redistributing any large
+    number of copies, to give them a chance to provide you with an
+    updated version of the Document.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x650.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x660.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>VERBATIM COPYING</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>MODIFICATIONS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x660.html b/doc/users_guide/html/x660.html
new file mode 100644
index 0000000..edf6731
--- /dev/null
+++ b/doc/users_guide/html/x660.html
@@ -0,0 +1,285 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>MODIFICATIONS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="COPYING IN QUANTITY"
+HREF="x654.html"><LINK
+REL="NEXT"
+TITLE="COMBINING DOCUMENTS"
+HREF="x696.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x654.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x696.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN660"
+>4. MODIFICATIONS</A
+></H1
+><P
+>You may copy and distribute a Modified Version of the
+    Document under the conditions of sections 2 and 3 above, provided
+    that you release the Modified Version under precisely this
+    License, with the Modified Version filling the role of the
+    Document, thus licensing distribution and modification of the
+    Modified Version to whoever possesses a copy of it.  In addition,
+    you must do these things in the Modified Version:</P
+><P
+></P
+><OL
+TYPE="A"
+><LI
+><P
+>Use in the Title Page
+      (and on the covers, if any) a title distinct from that of the
+      Document, and from those of previous versions (which should, if
+      there were any, be listed in the History section of the
+      Document).  You may use the same title as a previous version if
+      the original publisher of that version gives permission.</P
+></LI
+><LI
+><P
+>List on the Title Page,
+      as authors, one or more persons or entities responsible for
+      authorship of the modifications in the Modified Version,
+      together with at least five of the principal authors of the
+      Document (all of its principal authors, if it has less than
+      five).</P
+></LI
+><LI
+><P
+>State on the Title page
+      the name of the publisher of the Modified Version, as the
+      publisher.</P
+></LI
+><LI
+><P
+>Preserve all the
+      copyright notices of the Document.</P
+></LI
+><LI
+><P
+>Add an appropriate
+      copyright notice for your modifications adjacent to the other
+      copyright notices.</P
+></LI
+><LI
+><P
+>Include, immediately
+      after the copyright notices, a license notice giving the public
+      permission to use the Modified Version under the terms of this
+      License, in the form shown in the Addendum below.</P
+></LI
+><LI
+><P
+>Preserve in that license
+      notice the full lists of Invariant Sections and required Cover
+      Texts given in the Document's license notice.</P
+></LI
+><LI
+><P
+>Include an unaltered
+      copy of this License.</P
+></LI
+><LI
+><P
+>Preserve the section
+      entitled "History", and its title, and add to it an item stating
+      at least the title, year, new authors, and publisher of the
+      Modified Version as given on the Title Page.  If there is no
+      section entitled "History" in the Document, create one stating
+      the title, year, authors, and publisher of the Document as given
+      on its Title Page, then add an item describing the Modified
+      Version as stated in the previous sentence.</P
+></LI
+><LI
+><P
+>Preserve the network
+      location, if any, given in the Document for public access to a
+      Transparent copy of the Document, and likewise the network
+      locations given in the Document for previous versions it was
+      based on.  These may be placed in the "History" section.  You
+      may omit a network location for a work that was published at
+      least four years before the Document itself, or if the original
+      publisher of the version it refers to gives permission.</P
+></LI
+><LI
+><P
+>In any section entitled
+      "Acknowledgements" or "Dedications", preserve the section's
+      title, and preserve in the section all the substance and tone of
+      each of the contributor acknowledgements and/or dedications
+      given therein.</P
+></LI
+><LI
+><P
+>Preserve all the
+      Invariant Sections of the Document, unaltered in their text and
+      in their titles.  Section numbers or the equivalent are not
+      considered part of the section titles.</P
+></LI
+><LI
+><P
+>Delete any section
+      entitled "Endorsements".  Such a section may not be included in
+      the Modified Version.</P
+></LI
+><LI
+><P
+>Do not retitle any
+      existing section as "Endorsements" or to conflict in title with
+      any Invariant Section.</P
+></LI
+></OL
+><P
+>If the Modified Version includes new front-matter sections
+    or appendices that qualify as Secondary Sections and contain no
+    material copied from the Document, you may at your option
+    designate some or all of these sections as invariant.  To do this,
+    add their titles to the list of Invariant Sections in the Modified
+    Version's license notice.  These titles must be distinct from any
+    other section titles.</P
+><P
+>You may add a section entitled "Endorsements", provided it
+    contains nothing but endorsements of your Modified Version by
+    various parties--for example, statements of peer review or that
+    the text has been approved by an organization as the authoritative
+    definition of a standard.</P
+><P
+>You may add a passage of up to five words as a Front-Cover
+    Text, and a passage of up to 25 words as a Back-Cover Text, to the
+    end of the list of Cover Texts in the Modified Version.  Only one
+    passage of Front-Cover Text and one of Back-Cover Text may be
+    added by (or through arrangements made by) any one entity.  If the
+    Document already includes a cover text for the same cover,
+    previously added by you or by arrangement made by the same entity
+    you are acting on behalf of, you may not add another; but you may
+    replace the old one, on explicit permission from the previous
+    publisher that added the old one.</P
+><P
+>The author(s) and publisher(s) of the Document do not by
+    this License give permission to use their names for publicity for
+    or to assert or imply endorsement of any Modified Version.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x654.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x696.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>COPYING IN QUANTITY</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>COMBINING DOCUMENTS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x696.html b/doc/users_guide/html/x696.html
new file mode 100644
index 0000000..646e3d9
--- /dev/null
+++ b/doc/users_guide/html/x696.html
@@ -0,0 +1,164 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>COMBINING DOCUMENTS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="MODIFICATIONS"
+HREF="x660.html"><LINK
+REL="NEXT"
+TITLE="COLLECTIONS OF DOCUMENTS"
+HREF="x701.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x660.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x701.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN696"
+>5. COMBINING DOCUMENTS</A
+></H1
+><P
+>You may combine the Document with other documents released
+    under this License, under the terms defined in section 4 above for
+    modified versions, provided that you include in the combination
+    all of the Invariant Sections of all of the original documents,
+    unmodified, and list them all as Invariant Sections of your
+    combined work in its license notice.</P
+><P
+>The combined work need only contain one copy of this
+    License, and multiple identical Invariant Sections may be replaced
+    with a single copy.  If there are multiple Invariant Sections with
+    the same name but different contents, make the title of each such
+    section unique by adding at the end of it, in parentheses, the
+    name of the original author or publisher of that section if known,
+    or else a unique number.  Make the same adjustment to the section
+    titles in the list of Invariant Sections in the license notice of
+    the combined work.</P
+><P
+>In the combination, you must combine any sections entitled
+    "History" in the various original documents, forming one section
+    entitled "History"; likewise combine any sections entitled
+    "Acknowledgements", and any sections entitled "Dedications".  You
+    must delete all sections entitled "Endorsements."</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x660.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x701.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>MODIFICATIONS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>COLLECTIONS OF DOCUMENTS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x701.html b/doc/users_guide/html/x701.html
new file mode 100644
index 0000000..4995032
--- /dev/null
+++ b/doc/users_guide/html/x701.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>COLLECTIONS OF DOCUMENTS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="COMBINING DOCUMENTS"
+HREF="x696.html"><LINK
+REL="NEXT"
+TITLE="AGGREGATION WITH INDEPENDENT WORKS"
+HREF="x705.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x696.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x705.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN701"
+>6. COLLECTIONS OF DOCUMENTS</A
+></H1
+><P
+>You may make a collection consisting of the Document and
+    other documents released under this License, and replace the
+    individual copies of this License in the various documents with a
+    single copy that is included in the collection, provided that you
+    follow the rules of this License for verbatim copying of each of
+    the documents in all other respects.</P
+><P
+>You may extract a single document from such a collection,
+    and distribute it individually under this License, provided you
+    insert a copy of this License into the extracted document, and
+    follow this License in all other respects regarding verbatim
+    copying of that document.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x696.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x705.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>COMBINING DOCUMENTS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>AGGREGATION WITH INDEPENDENT WORKS</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x705.html b/doc/users_guide/html/x705.html
new file mode 100644
index 0000000..e2528af
--- /dev/null
+++ b/doc/users_guide/html/x705.html
@@ -0,0 +1,158 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>AGGREGATION WITH INDEPENDENT WORKS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="COLLECTIONS OF DOCUMENTS"
+HREF="x701.html"><LINK
+REL="NEXT"
+TITLE="TRANSLATION"
+HREF="x709.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x701.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x709.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN705"
+>7. AGGREGATION WITH INDEPENDENT WORKS</A
+></H1
+><P
+>A compilation of the Document or its derivatives with other
+    separate and independent documents or works, in or on a volume of
+    a storage or distribution medium, does not as a whole count as a
+    Modified Version of the Document, provided no compilation
+    copyright is claimed for the compilation.  Such a compilation is
+    called an "aggregate", and this License does not apply to the
+    other self-contained works thus compiled with the Document, on
+    account of their being thus compiled, if they are not themselves
+    derivative works of the Document.</P
+><P
+>If the Cover Text requirement of section 3 is applicable to
+    these copies of the Document, then if the Document is less than
+    one quarter of the entire aggregate, the Document's Cover Texts
+    may be placed on covers that surround only the Document within the
+    aggregate.  Otherwise they must appear on covers around the whole
+    aggregate.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x701.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x709.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>COLLECTIONS OF DOCUMENTS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>TRANSLATION</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x709.html b/doc/users_guide/html/x709.html
new file mode 100644
index 0000000..b3a2a44
--- /dev/null
+++ b/doc/users_guide/html/x709.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>TRANSLATION</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="AGGREGATION WITH INDEPENDENT WORKS"
+HREF="x705.html"><LINK
+REL="NEXT"
+TITLE="TERMINATION"
+HREF="x712.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x705.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x712.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN709"
+>8. TRANSLATION</A
+></H1
+><P
+>Translation is considered a kind of modification, so you may
+    distribute translations of the Document under the terms of section
+    4.  Replacing Invariant Sections with translations requires
+    special permission from their copyright holders, but you may
+    include translations of some or all Invariant Sections in addition
+    to the original versions of these Invariant Sections.  You may
+    include a translation of this License provided that you also
+    include the original English version of this License.  In case of
+    a disagreement between the translation and the original English
+    version of this License, the original English version will
+    prevail.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x705.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x712.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>AGGREGATION WITH INDEPENDENT WORKS</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>TERMINATION</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x712.html b/doc/users_guide/html/x712.html
new file mode 100644
index 0000000..5c973f1
--- /dev/null
+++ b/doc/users_guide/html/x712.html
@@ -0,0 +1,150 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>TERMINATION</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="TRANSLATION"
+HREF="x709.html"><LINK
+REL="NEXT"
+TITLE="FUTURE REVISIONS OF THIS LICENSE"
+HREF="x715.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x709.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x715.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN712"
+>9. TERMINATION</A
+></H1
+><P
+>You may not copy, modify, sublicense, or distribute the
+    Document except as expressly provided for under this License.  Any
+    other attempt to copy, modify, sublicense or distribute the
+    Document is void, and will automatically terminate your rights
+    under this License.  However, parties who have received copies, or
+    rights, from you under this License will not have their licenses
+    terminated so long as such parties remain in full
+    compliance.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x709.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x715.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>TRANSLATION</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FUTURE REVISIONS OF THIS LICENSE</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x715.html b/doc/users_guide/html/x715.html
new file mode 100644
index 0000000..3483cb6
--- /dev/null
+++ b/doc/users_guide/html/x715.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FUTURE REVISIONS OF THIS LICENSE</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="TERMINATION"
+HREF="x712.html"><LINK
+REL="NEXT"
+TITLE="How to use this License for your documents"
+HREF="x720.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x712.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="x720.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN715"
+>10. FUTURE REVISIONS OF THIS LICENSE</A
+></H1
+><P
+>The Free Software Foundation may publish new, revised
+    versions of the GNU Free Documentation License from time to time.
+    Such new versions will be similar in spirit to the present
+    version, but may differ in detail to address new problems or
+    concerns.  See <A
+HREF="http://www.gnu.org/copyleft/"
+TARGET="_top"
+>http://www.gnu.org/copyleft/</A
+>.</P
+><P
+>Each version of the License is given a distinguishing
+    version number.  If the Document specifies that a particular
+    numbered version of this License "or any later version" applies to
+    it, you have the option of following the terms and conditions
+    either of that specified version or of any later version that has
+    been published (not as a draft) by the Free Software Foundation.
+    If the Document does not specify a version number of this License,
+    you may choose any version ever published (not as a draft) by the
+    Free Software Foundation.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x712.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x720.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>TERMINATION</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>How to use this License for your documents</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x720.html b/doc/users_guide/html/x720.html
new file mode 100644
index 0000000..e4678bf
--- /dev/null
+++ b/doc/users_guide/html/x720.html
@@ -0,0 +1,160 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>How to use this License for your documents</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GNU Free Documentation License"
+HREF="gfdl.html"><LINK
+REL="PREVIOUS"
+TITLE="FUTURE REVISIONS OF THIS LICENSE"
+HREF="x715.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="x715.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix A. GNU Free Documentation License</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+>&nbsp;</TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN720"
+>How to use this License for your documents</A
+></H1
+><P
+>To use this License in a document you have written, include
+    a copy of the License in the document and put the following
+    copyright and license notices just after the title page:</P
+><A
+NAME="AEN723"
+></A
+><BLOCKQUOTE
+CLASS="BLOCKQUOTE"
+><P
+>      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.1
+      or any later version published by the Free Software Foundation;
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+      A copy of the license is included in the section entitled "GNU
+      Free Documentation License".</P
+></BLOCKQUOTE
+><P
+>If you have no Invariant Sections, write "with no Invariant
+    Sections" instead of saying which ones are invariant.  If you have
+    no Front-Cover Texts, write "no Front-Cover Texts" instead of
+    "Front-Cover Texts being LIST"; likewise for Back-Cover
+    Texts.</P
+><P
+>If your document contains nontrivial examples of program
+    code, we recommend releasing these examples in parallel under your
+    choice of free software license, such as the GNU General Public
+    License, to permit their use in free software.</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="x715.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FUTURE REVISIONS OF THIS LICENSE</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="gfdl.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/html/x85.html b/doc/users_guide/html/x85.html
new file mode 100644
index 0000000..9d20d85
--- /dev/null
+++ b/doc/users_guide/html/x85.html
@@ -0,0 +1,1762 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>The Gimp-Print Graphical User Interface</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="The User's Guide to Gutenprint - Complete Edition"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="GIMP and Gutenprint"
+HREF="ch-gimp-and-gimp-print.html"><LINK
+REL="PREVIOUS"
+TITLE="GIMP and Gutenprint"
+HREF="ch-gimp-and-gimp-print.html"><LINK
+REL="NEXT"
+TITLE="CUPS and Gutenprint"
+HREF="c443.html"><META
+http-equiv="Content-Type"
+content="text/html; charset="></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>The User's Guide to Gutenprint - Complete Edition</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="ch-gimp-and-gimp-print.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 2. GIMP and Gutenprint</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="c443.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN85"
+>The Gimp-Print Graphical User Interface</A
+></H1
+><P
+>   Now that the GIMP is displaying your picture, put your mouse over
+the picture and click the right mouse button. A menu will appear.
+Choose the
+    <SPAN
+CLASS="GUIMENU"
+>File</SPAN
+>-&gt;<SPAN
+CLASS="GUIMENUITEM"
+>Print</SPAN
+>
+menu option. This will cause the Gimp-Print GUI window to appear (see
+<A
+HREF="x85.html#FIG-GIMP-PRINT-GUI"
+>Figure 2-3</A
+>). Move the mouse cursor
+over the various parts of the Gimp-Print GUI window, and notice that
+if you leave your mouse in one place for a short time without clicking
+any buttons, a small box appears.  This box contains helpful text.
+These small boxes are called "tooltips" and are intended to remind you
+about the function of each part of the graphical interface.
+    </P
+><P
+>The next several sections will continuously refer to
+<A
+HREF="x85.html#FIG-GIMP-PRINT-GUI"
+>Figure 2-3</A
+> and
+<A
+HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
+>Figure 2-4</A
+>.  The difference between
+the two figures can be seen in the top right corner of the window.
+Notice that there are two tabs, one which reads
+<SPAN
+CLASS="GUILABEL"
+>Printer Settings</SPAN
+> and another which reads
+<SPAN
+CLASS="GUILABEL"
+>Image/Output Settings</SPAN
+>.  Notice also that the
+window is divided into several major sections which directly map to
+the major sections of this document:
+  <P
+></P
+><UL
+><LI
+><P
+><A
+HREF="x85.html#AEN230"
+>Preview</A
+></P
+></LI
+><LI
+><P
+><A
+HREF="x85.html#AEN130"
+>Printer Settings</A
+></P
+></LI
+><LI
+><P
+><A
+HREF="x85.html#AEN130"
+>Image/Output Settings</A
+></P
+></LI
+><LI
+><P
+><A
+HREF="x85.html#AEN254"
+>Position</A
+></P
+></LI
+><LI
+><P
+><A
+HREF="x85.html#AEN326"
+>Size</A
+></P
+></LI
+><LI
+><P
+><A
+HREF="x85.html#AEN426"
+>Printing and Saving Settings</A
+></P
+></LI
+></UL
+>
+  </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-GIMP-PRINT-GUI"
+></A
+><P
+><B
+>Figure 2-3. The Gimp-Print Graphical User Interface 1 (GUI)</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp-print-gui.png"></P
+></DIV
+></DIV
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-GIMP-PRINT-GUI-1"
+></A
+><P
+><B
+>Figure 2-4. The Gimp-Print Graphical User Interface 2 (GUI)</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp-print-gui-1.png"></P
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN130"
+>Printer Settings</A
+></H2
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN134"
+>Printer</A
+></H3
+><P
+>      Click on the <SPAN
+CLASS="GUILABEL"
+>Printer Settings</SPAN
+> tab near the
+top right hand corner of the window (see
+<A
+HREF="x85.html#FIG-GIMP-PRINT-GUI"
+>Figure 2-3</A
+>).  Then, click on the downward
+facing arrow to the right of the <SPAN
+CLASS="GUILABEL"
+>Printer</SPAN
+> combo
+box to see a list of the system printer queues.  Select the queue to which
+you would like the printed image to be sent.  One may also print the
+image directly to a file by selecting <SPAN
+CLASS="GUIMENUITEM"
+>File</SPAN
+>.
+In this event, the user will be prompted for the filename when either the
+<SPAN
+CLASS="GUIBUTTON"
+>Print</SPAN
+> button or the <SPAN
+CLASS="GUIBUTTON"
+>Print and Save
+Settings</SPAN
+> button is clicked.
+     </P
+><P
+>When either the <SPAN
+CLASS="GUIBUTTON"
+>Print and Save Settings</SPAN
+> button
+or the <SPAN
+CLASS="GUIBUTTON"
+>Save Settings</SPAN
+> button is clicked,
+the settings are saved in a file called
+<TT
+CLASS="FILENAME"
+>~/.gimp-1.2/printrc</TT
+>.  The user is cautioned about
+hand editing this file since it is generated by Gutenprint (although
+it was the only way that the author found for removing bogus entries
+created while playing with the <SPAN
+CLASS="GUIBUTTON"
+>New Printer</SPAN
+> button).
+    </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN148"
+>Setup Printer</A
+></H3
+><P
+>     Before any useful printing can occur, the user needs to associate
+the named printer with the
+actual make and model of the printer.  Click the
+<SPAN
+CLASS="GUIBUTTON"
+>Setup Printer</SPAN
+> button in
+the <SPAN
+CLASS="GUILABEL"
+>Printer</SPAN
+> section of the window (the upper
+right, and just below the Printer display box). When this is done, the
+following window appears:
+
+   <DIV
+CLASS="FIGURE"
+><A
+NAME="AEN153"
+></A
+><P
+><B
+>Figure 2-5. The Setup Printer Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp-print-setup.png"></P
+></DIV
+></DIV
+>
+    </P
+><P
+>     Scroll through the Printer Model section of the window until you
+find a printer which matches yours. If you cannot find the precise
+model, pick something close and hope for the best.  There are selections
+for a wide array of Postscript, inkjet, and laser printers.  After you
+have selected a printer, you will see the printer command displayed.
+    </P
+><P
+>The Gutenprint software does all of the necessary conversion of the
+image to be printed into the language of your printer. It is
+unnecessary and undesirable for any other sofware to manipulate this
+data.  (This is why the command contains the "-l" switch or the "-o
+raw" switch).  Please use care if you feel the need to edit this
+command.  Once you are satisfied with your selection, click the
+<SPAN
+CLASS="GUIBUTTON"
+>OK</SPAN
+> button.
+    </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN163"
+>New Printer</A
+></H3
+><P
+>     In the previous sections, the user selected an existing printer
+queue and associated a particular type of printer to that queue.  For
+most cases, this is probably all that is required.  However, some
+situations might require more detailed control over the handling of
+the printer data.
+     </P
+><P
+>     Click the <SPAN
+CLASS="GUIBUTTON"
+>New Printer</SPAN
+> button to tell the
+software that you wish to create a new name.  In this case, the new
+name may actually be an existing printer with different settings that
+you wish to save, or it may simply be a name associated with a
+particular command for handling the printer data.  A window will
+appear thus:
+
+   <DIV
+CLASS="FIGURE"
+><A
+NAME="AEN168"
+></A
+><P
+><B
+>Figure 2-6. The New Printer Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp-print-new-printer.png"></P
+></DIV
+></DIV
+>
+
+    Type a name into the window and click <SPAN
+CLASS="GUIBUTTON"
+>OK</SPAN
+>
+(or <SPAN
+CLASS="GUIBUTTON"
+>Cancel</SPAN
+> if you wish not to do this).
+Notice that the new name now appears as the selected <SPAN
+CLASS="GUILABEL"
+>Printer</SPAN
+>.
+As you change settings in the rest of the Gimp-Print GUI, they will be
+associated with this printer name.  When the settings are saved,
+they can be recovered easily by simply selecting this named printer
+from the Printer combo box.
+    </P
+><P
+>    One example where this feature might be used is as follows.  The
+author frequently prints photos on Epson 4x6 photo paper.  Note that
+this paper is physically larger than 4x6 and it has perforations on
+all four sides.  The author dislikes printing part of the image on the
+perforated parts of the paper which will be removed after
+printing the photo.  By selecting the proper scaling percentage,
+printing can be constrained to the 4x6 part of the paper which will
+remain after the perforated sections are removed.  The author has
+saved this setting using this feature of the Gutenprint software.
+    </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN179"
+>Media Size</A
+></H3
+><P
+>     The term <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>media</I
+></SPAN
+> refers to paper, card stock,
+envelopes, or whatever you have put into your printer onto which
+something will be printed.  Click the arrow to the right of the
+<SPAN
+CLASS="GUILABEL"
+>Media Size</SPAN
+> box to see a long list of different
+sizes of media.  Choose the size that matches the media which you have
+loaded into your printer.  Once you have made your choice, the drop
+down menu will disappear, and your choice will be shown in the
+<SPAN
+CLASS="GUILABEL"
+>Media Size</SPAN
+> box.  The available paper sizes will
+vary depending upon the printer model you have selected.
+   </P
+><P
+>   Some printers support arbitrary (within limits!) paper sizes.
+   These printers will let you select <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Custom</I
+></SPAN
+>
+   or <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Roll</I
+></SPAN
+> paper sizes.  When you select such a
+   printer, one or both of the <SPAN
+CLASS="GUILABEL"
+>Dimensions</SPAN
+> boxes
+   will let you enter your paper size (in inches or centimetres).  The
+   boxes will not let you enter sizes that your printer cannot handle.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN189"
+>Media Type</A
+></H3
+><P
+>     The type of media onto which your image will be printed should be
+selected here.  Click on the arrow to the right of the <SPAN
+CLASS="GUILABEL"
+>Media
+Type</SPAN
+> box to see a long list of the different types of media
+onto which you may print your image.  Media types include such things
+as plain paper, postcards, photo quality paper, transparencies, and
+more!  Once you have made your choice, the drop down menu will
+disappear, and your choice will be shown in the <SPAN
+CLASS="GUILABEL"
+>Media
+Type</SPAN
+> box.  The choices available will vary depending upon
+the printer model you have selected.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN194"
+>Media Source</A
+></H3
+><P
+>     The <SPAN
+CLASS="GUILABEL"
+>Media Source</SPAN
+> box allows the user to
+  choose the paper source, sometimes called <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Input
+  Slot</I
+></SPAN
+>, that the paper will be fed from.  Many printers
+  only have one available input source (such as the standard paper
+  tray), in which case this entry will be grayed out.  If your printer
+  does support multiple input sources, you may specify the source of
+  your choice here.  Some Epson printers offer a roll feed option in
+  addition to the standard paper tray, and many HP LaserJet printers
+  have multiple paper trays.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN199"
+>Ink Type</A
+></H3
+><P
+>   Some printers offer a choice of different types of ink or ink
+   cartridges.  Many Canon and Lexmark printers support various
+   combinations of cartridges, such as black only, black and color,
+   photo color, and so forth.  Most Epson printers let you choose
+   between three and four color printing (three color uses only color
+   ink, while four color uses black ink as well).  Epson printers that
+   support six color photo printing allow you to choose five and six
+   color printing as well.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN202"
+>Resolution</A
+></H3
+><P
+>     Click on the arrow to the right of the
+<SPAN
+CLASS="GUILABEL"
+>Resolution</SPAN
+> box to see a long list of resolutions
+at which you can print your image.  The list is written with the
+lowest resolution at the top, with increasing resolution (and
+generally improved printing quality) as you approach the bottom of the
+list.  Different printers support different resolution options, and
+many printers support different quality choices using the same basic
+resolution.  In this menu are a few terms which may be unfamiliar to
+you, and they will now be explained.
+   </P
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN206"
+>DPI</A
+></H4
+><P
+>         DPI is an acronym which stands for <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>D</I
+></SPAN
+>ots
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>P</I
+></SPAN
+>er <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>I</I
+></SPAN
+>nch.  This term refers
+to the number of dots that your printer will print in a space of one
+inch (approximately 2.54 cm).  This is highly dependent upon the
+capability of your printer.  Resolutions below 300 DPI are
+used for draft quality.  For general purpose printing, select
+300 - 360 DPI.  Higher quality printing can be achieved by
+selecting 600 - 720 DPI.  Settings higher than this are used for the
+highest possible quality for printing photographs and other high
+quality graphics.  Experiment with your printer and these settings
+with different types of graphics and photographs to see what
+results you can obtain with your printer.  High resolutions (large
+numbers of dots per inch) require substantial image processing time,
+and the print files can be very large; it's not uncommon for a full
+page, 1440x720 DPI image to require 100 MB of temporary storage!
+       </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN212"
+>Draft or Fast Economy Draft</A
+></H4
+><P
+>     When this text appears next to the resolution, it refers to the
+fact that the quality will be relatively low, but suitable for rough
+drafts.  Draft quality is higher than fast economy draft.  These
+options will give you the fastest printing speed.  Economy Draft uses
+less ink, and as a result the image will be pale.  These modes are
+generally not very useful for printing photographs.
+     </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN215"
+>Unidirectional</A
+></H4
+><P
+>         When printing an image, you have probably noticed the print
+head inside the printer moving back and forth across the print media.
+Many printers are capable of putting ink on the page regardless of
+which direction the print head is moving.  However, quality can
+sometimes be improved by only putting ink on the page when the printer
+head is moving in one direction.  The
+<SPAN
+CLASS="GUIMENUITEM"
+>Unidirectional</SPAN
+> setting instructs the
+software to only place ink on the page when the print head is moving
+one way.  When the print head returns, it will not place ink on the
+page.  On many printers, the print quality is better, at the expense
+of printing speed.
+       </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN219"
+>High(est) Quality</A
+></H4
+><P
+>         With lower quality print modes, one may see an effect where
+the printed image looks like it has rows of stripes with a small
+separation between the stripes.  This effect is called "banding" and
+is undesirable.  In the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>high</I
+></SPAN
+> and
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>highest</I
+></SPAN
+> quality modes, the printer will make more
+passes over the same part of the page in order to improve quality and
+(reduce or) eliminate banding.  This requires more temporary disk
+space and prints more slowly, but does not require significantly more
+processing time.
+       </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN224"
+>DMT</A
+></H4
+><P
+>       DMT is an acronym which stands for <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>D</I
+></SPAN
+>ot
+       <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>M</I
+></SPAN
+>odulation
+       <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>T</I
+></SPAN
+>echnology.
+       This term refers to a print mode used by certain Canon printers
+       to improve the quality of the printed output.  Unfortunately,
+       at this time,  all of the available DMT modes do not work
+       correctly.  The cases which do work correctly will offer
+       significantly improved printing quality. 
+       </P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN230"
+>Preview</A
+></H2
+><P
+>   Notice in the upper left of the window is a preview of your image.
+This preview is a representation of where your picture will print on
+the selected media, and approximately what it will look like.  This
+preview will be updated as you modify selections in the
+<SPAN
+CLASS="GUILABEL"
+>Position</SPAN
+>, <SPAN
+CLASS="GUILABEL"
+>Size</SPAN
+>,
+<SPAN
+CLASS="GUILABEL"
+>Media Size</SPAN
+>, and <SPAN
+CLASS="GUILABEL"
+>Output Type</SPAN
+>
+portions of the window. You may also select the image with your mouse
+and move it manually if you wish. In doing so, you will note that the
+<SPAN
+CLASS="GUILABEL"
+>Position</SPAN
+> settings are updated accordingly.  Take
+note of the arrow, which points toward the top of the media, where top
+is the first part of the media to enter the printer.
+  </P
+><P
+>  The preview may be moved around the page as follows:
+  </P
+><P
+></P
+><UL
+><LI
+><P
+> Clicking and dragging the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>left</I
+></SPAN
+>
+  (primary) mouse button moves the image around the page as you would
+  expect; the image moves with the mouse.  </P
+></LI
+><LI
+><P
+> Clicking and dragging the
+  <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>middle</I
+></SPAN
+> mouse button moves the image around the
+  page in a finer fashion, such that each pixel of mouse movement
+  moves the image by one point (1/72 inch).  This allows very fine
+  placement of the image on the page.  </P
+></LI
+><LI
+><P
+> Clicking and dragging the
+  <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>right</I
+></SPAN
+> (secondary) mouse button moves the image
+  around the page much the same as with the left button, but the image
+  will only move in units of the image size.  Thus, if the image is
+  one inch wide and two inches tall, the image will not move at all
+  until you have moved the mouse far enough so that the image would be
+  moved one inch vertically and two inches horizontally.  This is
+  handy if you wish to print multiple images of the same size on one
+  piece of paper.</P
+></LI
+><LI
+><P
+> If you hold down the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>shift</I
+></SPAN
+> key
+  on the keyboard when you click and drag the mouse, the image will
+  only move in the horizontal or vertical direction (depending upon
+  which way you first move the mouse).  This allows you to constrain
+  motion to the horizontal or vertical. </P
+></LI
+><LI
+><P
+> If you click another button while dragging the
+  mouse, the image will immediately return to the position it was in
+  before you clicked the mouse the first time.  This allows you to
+  not move the image if you have started moving it and have decided
+  that you don't want to move it.  The preview will not respond to the
+  mouse until you release all of the mouse buttons and click and drag
+  afresh. </P
+></LI
+></UL
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN254"
+>Position</A
+></H2
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN256"
+>Orientation</A
+></H3
+><P
+>      The Orientation menu allows the user to choose the orientation
+of the paper.  The menu selections are
+<SPAN
+CLASS="GUIMENUITEM"
+>Auto</SPAN
+>, <SPAN
+CLASS="GUIMENUITEM"
+>Portrait</SPAN
+>,
+<SPAN
+CLASS="GUIMENUITEM"
+>Landscape</SPAN
+>, <SPAN
+CLASS="GUIMENUITEM"
+>Upside
+down</SPAN
+>, and <SPAN
+CLASS="GUIMENUITEM"
+>Seascape</SPAN
+>.  Click on
+the rectangular tab to see these choices
+and make your selection.  When you have done so, the pulldown menu
+will have disappeared, and your choice will appear.  Also, note that
+the preview image will have changed accordingly.
+   </P
+><P
+>     When set to <SPAN
+CLASS="GUIMENUITEM"
+>Auto</SPAN
+>, the software will make an
+intelligent choice of orientation based on the dimensions of the image
+to be printed.   <SPAN
+CLASS="GUIMENUITEM"
+>Portrait</SPAN
+> orients the print media
+with the longest edge going from top to bottom, while
+<SPAN
+CLASS="GUIMENUITEM"
+>Landscape</SPAN
+> orients the paper with the longest edge
+going from side to side.  <SPAN
+CLASS="GUIMENUITEM"
+>Upside down</SPAN
+> and
+<SPAN
+CLASS="GUIMENUITEM"
+>Seascape</SPAN
+> orient the paper the same as
+<SPAN
+CLASS="GUIMENUITEM"
+>Portrait</SPAN
+> and  <SPAN
+CLASS="GUIMENUITEM"
+>Landscape</SPAN
+>
+respectively, with the difference being that the image is rotated 180 degrees.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN272"
+>Automatic Centering</A
+></H3
+><P
+>      There are three buttons that deal with centering an image.  The
+leftmost button is the <SPAN
+CLASS="GUIBUTTON"
+>Vertically</SPAN
+> button, the
+middle button is the <SPAN
+CLASS="GUIBUTTON"
+>Both</SPAN
+> button, and
+the rightmost button is the <SPAN
+CLASS="GUIBUTTON"
+>Horizontally</SPAN
+>
+button.  Use the <SPAN
+CLASS="GUIBUTTON"
+>Both</SPAN
+> button to center your
+image both horizontally and vertically.  This will cause the top and
+bottom borders to be equal, and the left and right borders to be
+equal.  If you have placed your image manually by using the mouse
+button, then you may center the image in the horizontal direction only
+by clicking on the <SPAN
+CLASS="GUIBUTTON"
+>Horizontally</SPAN
+> button.
+Likewise, to adjust the image only in the vertical direction, click on
+the <SPAN
+CLASS="GUIBUTTON"
+>Vertically</SPAN
+> button.  Note that in
+each case, the image is centered with regard to the edges of the
+media, and without regard to the printable portion of the media.  Many
+printers are incapable of printing to each edge of the media.  Some
+media may have edges which detach.  Consult your printer documentation
+for more details regarding your printer's capabilities in this regard.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN281"
+>Manual Settings</A
+></H3
+><P
+>      You will notice that there are six boxes that contain numbers
+just below the Orientation menu and just above the GUI buttons related
+to centering an image.  When you move the preview image manually with
+the mouse, or when you click on one of the centering buttons, the
+preview image moves and these six boxes get updated.
+   </P
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN284"
+>Left</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Left</SPAN
+> box denotes
+the number of units (cm or inches) that the left side of the image
+will be printed away from the left edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN291"
+>Right</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Right</SPAN
+> box denotes
+the number of units (cm or inches) that the right side of the image
+will be printed away from the left edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN298"
+>Right Border</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Right Border</SPAN
+> box denotes
+the number of units (cm or inches) that the right side of the image
+will be printed away from the right edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN305"
+>Top</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Top</SPAN
+> box denotes
+the number of units (cm or inches) that the top side of the image
+will be printed away from the top edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN312"
+>Bottom</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Bottom</SPAN
+> box denotes
+the number of units (cm or inches) that the bottom side of the image
+will be printed away from the top edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN319"
+>Bottom Border</A
+></H4
+><P
+>     The number appearing in the <SPAN
+CLASS="GUIMENUITEM"
+>Bottom Border</SPAN
+> box denotes
+the number of units (cm or inches) that the bottom side of the image
+will be printed away from the bottom edge of the media.  You may select
+the units by clicking the <SPAN
+CLASS="GUIBUTTON"
+>Inch</SPAN
+> or
+<SPAN
+CLASS="GUIBUTTON"
+>cm</SPAN
+> buttons in the  <SPAN
+CLASS="GUILABEL"
+>Units</SPAN
+> section just below
+these GUI boxes.
+   </P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN326"
+>Size</A
+></H2
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN328"
+>Slider Bar and Spin Box</A
+></H3
+><P
+>      The slider bar can be moved as desired by the user.  Notice
+that while sliding this bar, the preview image changes accordingly.
+One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
+These boxes are the six position boxes (left, right, right border,
+top, bottom, bottom border), the two size boxes (width and height),
+and the spin box to the right of the slider bar.
+   </P
+><P
+>   This slider bar is used to scale the image to a desirable size, but the same effect can
+be obtained by either clicking an arrow on the spin box to the right of this
+slider bar, or by manually typing a number into this spin box.  Notice
+that by setting the spin box in this way, the slider bar is also
+moved.  All of the described methods will cause the image to be
+scaled accordingly.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN332"
+>Scale by Percent or PPI</A
+></H3
+><P
+>       One may choose to scale the image by a percentage, or by PPI,
+which means "<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>p</I
+></SPAN
+>ixels <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>p</I
+></SPAN
+>er
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>i</I
+></SPAN
+>nch".  Click the radio button
+next to the word to set the desired scaling factor.
+   </P
+><P
+>     When scaling by a percentage, the number reflected in the spin
+box next to the slider bar represents the percentage relative
+to the full size of the selected print medium.  For example, with this spin box
+set to 50, the image will be scaled to 50% of the size of the print
+medium.  When set to 100, the image will attempt to fill the print
+medium, within the constraints of maintaining the proper aspect ratio
+and the margins of the selected print medium.  This effect can be seen
+in the preview window.
+   </P
+><P
+>     When scaling by PPI, the number reflected in the spin box next to
+the slider bar represents the number of pixels that will be
+printed per inch.  For example, if the user is printing a 640x480
+image at a size of 6.4x4.8 inches (as measured by the size boxes), the
+image will be printed at 100 DPI.
+   </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN340"
+>Use Original Image Size</A
+></H3
+><P
+>       By clicking this button, the image will be scaled to as close
+to the native size of the image as possible.  This effect can
+immediately be seen in the preview image.
+     </P
+><P
+>     The native image size may be found or set in the GIMP by
+     selecting <SPAN
+CLASS="GUIMENUITEM"
+>Image/Scale Image</SPAN
+> in the
+     GIMP.  Under the <SPAN
+CLASS="GUILABEL"
+>Print Size and Display Unit</SPAN
+>
+     group in the <SPAN
+CLASS="GUILABEL"
+>Scale Image</SPAN
+> dialog, you can
+     determine (or change) the width and height of the image, or
+     choose the resolution.
+     </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN347"
+>Width and Height</A
+></H3
+><P
+>       These boxes show the size of the printed image in either inches
+or centimeters (depending on which unit is selected).  The user may
+choose to manually modify these values.  When one value is modified,
+the other value is automatically modified in order to maintain the
+aspect ratio (the ratio of width to height).  This effect can be
+immediately seen in the preview image.
+     </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN350"
+>Units</A
+></H3
+><P
+>      The units can be set to inches or centimeters by clicking the appropriate
+radio button next to the desired unit.  This setting effects the
+values printed in the six position boxes (left, right, right border,
+top, bottom, bottom border) and the two size boxes (width and height).
+   </P
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN353"
+>Image/Output Settings</A
+></H2
+><P
+>   By clicking on the tab labeled <SPAN
+CLASS="GUILABEL"
+>Image/Output
+Settings</SPAN
+>, the Gimp-Print window will appear as shown in
+<A
+HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
+>Figure 2-4</A
+>.  Notice that there are
+two sections to this portion of the window, namely,
+<SPAN
+CLASS="GUILABEL"
+>Image Type</SPAN
+> and
+<SPAN
+CLASS="GUILABEL"
+>Output Type</SPAN
+>.
+
+   </P
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN360"
+>Image Type</A
+></H3
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN362"
+>Line Art</A
+></H4
+><P
+>      This setting tells the printer driver to generate color
+quickly.  The color is bold and bright, but color accuracy is not very
+good.  There may also be some unexpectedly sharp transitions in
+colors.  This mode is acceptable for printing text with small amounts
+of color, and may be acceptable for presentation graphics.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN365"
+>Solid Colors</A
+></H4
+><P
+>      This mode produces color which is considerably more accurate
+than the <SPAN
+CLASS="GUILABEL"
+>Line Art</SPAN
+> mode, but with a reduction in performance.  In
+general, hues will be accurate but tonalities may not be accurate.
+There should be no sharp transitions in colors.  This mode is good for
+printing presentation graphics in most cases.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN369"
+>Photograph</A
+></H4
+><P
+>      This mode produces the most accurate colors and tonalities at a
+greater cost in performance.  This is the mode to use when printing
+high quality photographs or other high quality images.
+    </P
+></DIV
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN372"
+>Output Type</A
+></H3
+><P
+>      The user is given the choice of color, black and white, and
+grayscale.  Color is selected when the desired output is to be in
+color.  Greyscale will result in the printed image having various
+shades of grey.  Black and white is just that.  The effect of this
+setting can be seen in the preview window.
+    </P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN375"
+>Adjust Output</A
+></H3
+><P
+>      Clicking on this button causes the <SPAN
+CLASS="GUILABEL"
+>Print Color Adjust</SPAN
+> window to
+appear (see <A
+HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
+>Figure 2-7</A
+>).  In
+this window, one will see a representation of the image to be printed
+as well as several slider bars.  These slider bars collectively adjust
+many different aspects of the image.  The values can also be adjusted
+by clicking the arrows or by typing a value into the appropriate spin
+box on the right side of each slider bar.
+   </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="FIG-GIMP-PRINT-COLOR-ADJUST"
+></A
+><P
+><B
+>Figure 2-7. The Print Color Adjust Window</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="figures/gimp-print-print-color-adjust.png"></P
+></DIV
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN387"
+>Brightness</A
+></H4
+><P
+>    Adjust the brightness of the image.  A setting of 0.0 gives a fully black
+image, while a 2.0 setting gives a fully white image.  Values greater than 1.0 will result in
+ black not being solid and highlights turning white; values less than
+ 1.0 will result in white not being perfectly clear and shadows turning
+ black.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN390"
+>Contrast</A
+></H4
+><P
+>    Adjust the contrast of the image.  A setting of 0.0 gives a solid gray for the
+entire image, the exact gray depending upon the brightness chosen.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN393"
+>Cyan, Magenta, Yellow</A
+></H4
+><P
+>These three options allow specification of the cyan, magenta, and
+yellow levels independently, for rebalancing the levels.  Normally,
+these should be adjusted to yield neutral gray, but they can be used
+for other effects.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN396"
+>Saturation</A
+></H4
+><P
+>Adjust the brilliance of colors.  A setting of 0.0 results in pure grayscale.
+A saturation setting of less than 1.0 results in more muted colors.  A
+saturation setting of greater than 1.0 results in more vibrant colors.  Very high
+saturation often results in very strange effects, including
+posterization and banding that might not be expected.  For normal
+purposes, the saturation should generally be set to a value less than 1.5.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN399"
+>Density</A
+></H4
+><P
+>Adjust the amount of ink deposited on the paper.  If you have chosen the
+correct paper type and are getting ink bleeding through the paper
+or puddling, try reducing the density to the lowest value you
+can while still achieving solid black.  If black is not solid
+black, even with the contrast and brightness at 1.0, try increasing
+the density.  Note that changes to this setting will not be visible in
+the image preview.
+    </P
+><P
+>All of the supported printers actually need less than 100% ink
+density in most cases, so the actual density is something other than
+the nominal density setting.  The effective density setting cannot go
+above 100%, so if a value specified will result in an excessively high
+density level, it will be silently limited to a setting of 1.0.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN403"
+>Gamma</A
+></H4
+><P
+>Adjust the gamma of the image, over and above the printer-specific
+correction.  Gamma less than 1.0 will result in a darker image; gamma
+greater than 1.0 will result in a lighter image.  Unlike brightness,
+gamma adjustment does not change the endpoints; it merely changes the
+shape of the input-&#62;output curve.
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN406"
+>Dither Algorithm</A
+></H4
+><P
+>The recommended dither algorithm is <SPAN
+CLASS="GUIMENUITEM"
+>Adaptive
+Hybrid</SPAN
+> (which is the default) for text or other fine
+black detail, or if this is mixed with continuous tone images.  The
+<SPAN
+CLASS="GUIMENUITEM"
+>Ordered</SPAN
+> dithering algorithm is just as good
+(and somewhat faster) for pure continuous-tone images and photographs,
+but may yield poor results with text or other fine detail,
+particularly at high printing resolutions.
+    </P
+><P
+> The <SPAN
+CLASS="GUIMENUITEM"
+>Fast</SPAN
+> algorithm gives the
+fastest results at the expense of color accuracy.  It is a simplified
+ordered dither.  On simple four color printers (or other printers used
+in four color mode), the quality is similar to
+<SPAN
+CLASS="GUIMENUITEM"
+>Ordered</SPAN
+>, although dark gray rendition is
+not as good due to a simpler transfer between black and colored ink.
+With six-color printers, color rendition is somewhat worse, but it
+should be quite usable in cases where optimum quality is not critical.
+In black and white, it is an efficient way to render grayscale, but it
+may not give best results when used with variable dot size printers
+(modern Epson printers, or Canon printers using DMT).  On rare three
+color printers (CMY only) the results should be identical to ordered
+dither.
+    </P
+><P
+> <SPAN
+CLASS="GUIMENUITEM"
+>Very Fast</SPAN
+> is even faster than
+<SPAN
+CLASS="GUIMENUITEM"
+>Fast</SPAN
+>, with even more loss of quality.
+Color and grayscale output will show strong patterning that resembles
+screening, although it isn't.  On laser printers, and possibly on
+certain kinds of text and line art, <SPAN
+CLASS="GUIMENUITEM"
+>Very
+Fast</SPAN
+> dithering may actually yield the best quality.
+    </P
+><P
+>Error diffusion algorithms (<SPAN
+CLASS="GUIMENUITEM"
+>Hybrid
+Floyd-Steinberg</SPAN
+> is such an algorithm) perform very well
+at high densities, and are capable of
+rendering very fine detail rather well, but they tend to exhibit artifacts in
+the form of "waves" or "worms" of dots which results in noticeable
+texturing in pale areas.  Furthermore, pale areas immediately adjacent
+to white take a while to "build up" sufficient error to print at all.
+This is sometimes called "tearing" or "waterfalling".
+    </P
+></DIV
+><DIV
+CLASS="SECT4"
+><H4
+CLASS="SECT4"
+><A
+NAME="AEN420"
+>Set Defaults and Close</A
+></H4
+><P
+>      When the <SPAN
+CLASS="GUIBUTTON"
+>Set Defaults</SPAN
+> button is clicked,
+the slider bar settings will return to their default values.  The
+dither algorithm setting is uneffected.  The <SPAN
+CLASS="GUILABEL"
+>Print Color
+Adjust</SPAN
+> window will close when the
+<SPAN
+CLASS="GUIBUTTON"
+>Close</SPAN
+> button is clicked.
+    </P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN426"
+>Printing and Saving Settings</A
+></H2
+><P
+>    At the bottom of the Gimp-Print window, there are five buttons labeled
+<SPAN
+CLASS="GUIBUTTON"
+>About</SPAN
+>,
+<SPAN
+CLASS="GUIBUTTON"
+>Print and Save Settings</SPAN
+>,
+<SPAN
+CLASS="GUIBUTTON"
+>Save Settings</SPAN
+>,
+<SPAN
+CLASS="GUIBUTTON"
+>Print</SPAN
+>,
+and <SPAN
+CLASS="GUIBUTTON"
+>Cancel</SPAN
+>.  The <SPAN
+CLASS="GUIBUTTON"
+>About</SPAN
+>
+button will show information about the Gutenprint software, such as
+the version number, authors names, project web site, and software
+licensing.  After clicking on the <SPAN
+CLASS="GUIBUTTON"
+>About</SPAN
+>, read
+the information, and then close the window by pressing the
+<SPAN
+CLASS="GUIBUTTON"
+>OK</SPAN
+> button.
+    </P
+><P
+>      The <SPAN
+CLASS="GUIBUTTON"
+>Print and Save Settings</SPAN
+> button will
+save the current settings and then print the desired image.  Recall
+that these settings are saved in <TT
+CLASS="FILENAME"
+>~/.gimp-1.2/printrc</TT
+>.  The
+<SPAN
+CLASS="GUIBUTTON"
+>Save Settings</SPAN
+> button will only save the
+settings.  The <SPAN
+CLASS="GUIBUTTON"
+>Print</SPAN
+> button will print the
+image only.  The <SPAN
+CLASS="GUIBUTTON"
+>Cancel</SPAN
+> will close the
+Gimp-Print GUI window.
+    </P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="ch-gimp-and-gimp-print.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="book1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="c443.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>GIMP and Gutenprint</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="ch-gimp-and-gimp-print.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>CUPS and Gutenprint</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/users_guide/title.sgml b/doc/users_guide/title.sgml
new file mode 100644
index 0000000..12d83b6
--- /dev/null
+++ b/doc/users_guide/title.sgml
@@ -0,0 +1,64 @@
+    <para>
+    Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation with no invariant sections, no Front-Cover texts, and no
+Back-Cover texts.  A copy of the license is included in <xref linkend="gfdl">.
+    </para>
+
+  </legalnotice>
+
+  <abstract>
+  <para>
+    The Gutenprint Top Quality Printer Drivers (hereafter
+called Gutenprint) are a set of printer drivers written to
+take advantage of the full capabilities of a wide range of
+printers. These drivers should work on any POSIX compliant operating
+system (e.g. Linux, Solaris, IRIX, etc).  This document will explain how to
+use the Gutenprint software to achieve high quality printouts from the
+<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image
+Manipulation Program) and
+<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing
+System).
+  </para>
+  <para>
+    Please note that in addition to using the Gutenprint software as a
+print plugin for the GIMP, and as a set of printer drivers for CUPS, this
+software can also be compiled and used with the 
+<ulink url="http://www.ghostscript.com">Ghostscript</ulink> software
+and with the 
+<ulink
+url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink> 
+software.
+   </para>
+   <para>
+Regardless of whether the Gutenprint software is used with the GIMP,
+CUPS, Ghostscript, or Foomatic, the print quality and printer settings
+remain the same.  However, use of the Gutenprint with Ghostscript and
+Foomatic is not covered in this document.  These topics may be covered
+in a future revision of this document.
+  </para>
+  <para>
+  This document corresponds to version 4.2.0 and later of the Gutenprint
+software. This document will serve as a guide to the user, and as such
+will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
+Foomatic, or any other related software.
+  </para>
+
+  <para>
+    Andy Stewart, the author, is the founder of the
+<ulink url="http://www.wlug.org">Worcester Linux Users' Group</ulink> in
+Worcester, Massachusetts, USA.  The group was founded in July 1997 and has
+approximately 140 people on its mailing list.  Monthly meetings are
+held and all are invited.
+  </para>
+
+  <para>
+    In terms of "code", this is the author's first contribution to the
+open source community, and definitely his first experience with DocBook.
+Constructive comments, praise, words of encouragement, and the like
+will be most appreciated if e-mailed to the
+<ulink url="mailto:andystewart@attbi.com">author</ulink>.
+  </para>
+  </abstract>
+ </bookinfo>
diff --git a/doc/users_guide/users-guide.pdf b/doc/users_guide/users-guide.pdf
new file mode 100644
index 0000000..54302a6
--- /dev/null
+++ b/doc/users_guide/users-guide.pdf
diff --git a/doc/users_guide/users-guide.sgml b/doc/users_guide/users-guide.sgml
new file mode 100644
index 0000000..7a22810
--- /dev/null
+++ b/doc/users_guide/users-guide.sgml
@@ -0,0 +1,37 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY title SYSTEM "title.sgml">
+<!ENTITY history SYSTEM "history.sgml">
+<!ENTITY gimp SYSTEM "gimp.sgml">
+<!ENTITY cups SYSTEM "cups.sgml">
+<!ENTITY utils SYSTEM "utils.sgml">
+<!ENTITY gfdl  SYSTEM "gfdl.sgml">
+]>
+<book>
+
+ <bookinfo>
+  <title>The User's Guide to Gutenprint - Complete Edition</title>
+  <date>April 7, 2002</date>
+  <pubdate>April 7, 2002</pubdate>
+  <author>
+    <firstname>Andy</firstname>
+    <surname>Stewart</surname>
+  </author>
+  <copyright>
+    <year>2002</year>
+    <holder>Andy Stewart</holder>
+  </copyright>
+  <legalnotice>
+    <para>The User's Guide to Gutenprint - Complete Edition,
+Copyright 2002, Andy Stewart. 
+    </para>
+
+&title;
+&history;
+&gimp;
+&cups;
+&utils;
+&gfdl;
+</book>
+
+
+
diff --git a/doc/users_guide/util-edition.sgml b/doc/users_guide/util-edition.sgml
new file mode 100644
index 0000000..ed45d6c
--- /dev/null
+++ b/doc/users_guide/util-edition.sgml
@@ -0,0 +1,57 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY title   SYSTEM "title.sgml">
+<!ENTITY history SYSTEM "history.sgml">
+<!ENTITY gimp    SYSTEM "gimp.sgml">
+<!ENTITY cups    SYSTEM "cups.sgml">
+<!ENTITY utils   SYSTEM "utils.sgml">
+<!ENTITY gfdl    SYSTEM "gfdl.sgml">
+]>
+<book>
+
+ <bookinfo>
+  <title>The User's Guide to the Gutenprint - UTIL Edition</title>
+  <date>April 7, 2002</date>
+  <pubdate>April 7, 2002</pubdate>
+  <author>
+    <firstname>Andy</firstname>
+    <surname>Stewart</surname>
+  </author>
+  <copyright>
+    <year>2002</year>
+    <holder>Andy Stewart</holder>
+  </copyright>
+  <legalnotice>
+    <para>The User's Guide to the Gutenprint - UTIL Edition, Copyright
+2002, Andy Stewart.
+    </para>
+
+&title;
+
+<chapter><title>UTIL Edition</title>
+
+  <caution><title>PLEASE NOTE</title>
+
+    <para>
+    This manual includes a subset of chapters from a more complete
+manual entitled <emphasis>The User's Guide to the Gutenprint Top
+Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
+to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
+Project</ulink> home page.
+    </para>
+    <para>
+    This version of the manual has been specifically packaged in this
+way in an attempt to better suit the needs of people interested only
+in utility programs packaged with the Gutenprint software.
+    </para>
+
+  </caution>
+
+</chapter>
+
+&history;
+&utils;
+&gfdl;
+</book>
+
+
+
diff --git a/doc/users_guide/utils.sgml b/doc/users_guide/utils.sgml
new file mode 100644
index 0000000..36f6a18
--- /dev/null
+++ b/doc/users_guide/utils.sgml
@@ -0,0 +1,421 @@
+
+ <chapter><title>Gutenprint Utilities</title>
+   <sect1><title>escputil</title>
+     <para>
+       <emphasis>escputil</emphasis> is a command line utility which
+allows the user to perform a variety of maintenance tasks on Epson
+Stylus inkjet printers.  These tasks include head alignment, head
+cleaning, nozzle check, printer identification, and retrieval of the ink
+level from the printer.  In order for many of the
+<emphasis>escputil</emphasis> functions to work, the user must have
+read/write access to the raw printer device (typically /dev/lp0,
+/dev/usb/lp0, and the like).  In general, these operations should be
+performed by the root user.  As always, the user must insure that the
+directory containing the <emphasis>escputil</emphasis> utility is
+listed in the &dollar;PATH environment variable, or that the full path is
+specified on the command line.  The examples in this section will
+assume the former.
+     </para>
+
+     <caution>
+     <title>Caution</title>
+     <para>
+       The <emphasis>escputil</emphasis> utility was designed for use
+ONLY with Epson Stylus inkjet printers supported by the Gutenprint
+software.  It is possible that damage MIGHT occur to your printer if
+this utility is misused or if it is used with a printer other than an
+Epson Stylus inkjet printer.  It is the sole responsibility of the
+user to insure that this utility is suitable for the task at hand.
+     </para>
+     </caution>
+
+
+     <para>
+       In this section, specific examples of common usage will be
+presented.  A summary of the command line switches can be
+found in the <emphasis>escputil</emphasis>(1) man page.
+     </para>
+
+   <sect2><title>Determining Ink Level</title>
+     <para>
+       Perhaps the most basic function performed by
+<emphasis>escputil</emphasis> is that of determining the amount of ink
+remaining in the printer. To do this, the user must know the name of
+the raw printer device.  This is usually /dev/lp0 for a printer
+connected to the parallel port, or /dev/usb/lp0 for a printer
+connected to the USB.  
+     </para>
+     <para>
+If there are multiple printers connected, one of them may be referenced as
+/dev/lp1 or perhaps /dev/usb/lp1.  In the event of uncertainty, and if
+CUPS is in use, view the following <ulink url="http://localhost:631/printers">URL</ulink> 
+with a web browser. At that URL, look for a line which reads "Device
+URI".  The author's USB printer is listed as "Device URI:  usb:/dev/usb/lp0".
+     </para>
+     <para>
+For this example, assume that the raw printer device is a USB printer
+specified as /dev/usb/lp0.  To get the ink level for this printer,
+issue this command and notice the output.
+     </para>
+
+  <programlisting>
+  <![ CDATA [
+# escputil -r /dev/usb/lp0 -i
+
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+           Ink color    Percent remaining
+               Black     18
+                Cyan     71
+             Magenta     70
+              Yellow     67
+          Light Cyan     71
+       Light Magenta     70
+    ]]>
+  </programlisting>
+
+     <para>
+The user would substitute their own raw printer device for the one
+shown in the example after the "-r" switch.  Notice that the printout
+shows the percent of ink remaining for each color of the author's
+Epson Stylus Photo 870.  When the ink levels get too low, print
+quality will suffer.  In the author's personal experience, ink levels
+approaching 10% begin to cause print quality degredation, but this
+will vary depending on the precise printer model.
+     </para>
+   </sect2>
+
+   <sect2><title>Error During Ink Level Determination</title>
+     <para>
+       What?  The example above did not work?  An error message was
+printed?  What does it mean?  There are several possibilities,
+depending on the specific error message.  If the error message is
+"Invalid argument" (see following example), the problem is that the
+2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
+
+  <programlisting>
+  <![ CDATA [
+# escputil -r /dev/lp0 -i
+
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details.
+
+Cannot read from /dev/lp0: Invalid argument
+    ]]>
+  </programlisting>
+
+     Another possibile cause for error is that the raw printer device
+does not have both read and write permission for the user attempting
+to access the device.  In this case, the error message will read
+"Permission denied".  A final possibility is that the raw printer
+device specified is incorrect, in which case the error message will
+read "No such device".
+   </para>
+
+   </sect2>
+
+   <sect2><title>Nozzle Check</title>
+     <para>
+       On an inkjet printer, there are several small holes on the
+bottom of each ink cartridge through which the ink must flow smoothly
+in order to create high quality images on paper.  If these holes
+become clogged, the printed image will show small gaps where there
+should have been ink.  One can easily test for the existence of this
+condition by running a nozzle check.  One need not be the root user to
+issue this command.  Note that as shown, the command will print a
+nozzle test pattern on the default printer.  If there are multiple
+printers present, the desired printer must be specified with an
+additional "-P printer_name" switch, where "printer_name" is the name
+of the desired printer.
+     </para>
+     <para>
+       The printer will print a series of black (and colored) slanted
+lines on the paper.  Observe these lines carefully.  If there are gaps
+or spaces in these lines, then the corresponding nozzle is clogged and
+the print head must be cleaned.  However, if there are no gaps, the 
+nozzles are clean.
+     </para>
+  <programlisting>
+  <![ CDATA [
+# escputil -n       
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+Running nozzle check, please ensure paper is in the printer.
+    ]]>
+  </programlisting>
+   </sect2>
+
+   <sect2><title>Clean the Print Head</title>
+     <para>
+       If the printed output is showing gaps where there should have
+been ink, it is likely that one or more nozzles are clogged and the
+print head is in need of cleaning.  One can verify this by first
+running a nozzle check and looking for gaps in the printout.  To clean
+the print head, issue the following command.  One need not be the root user to
+issue this command.  Note that as shown, the command will clean the
+print head on the default printer.  If there are multiple
+printers present, the desired printer must be specified with an
+additional "-P printer_name" switch, where "printer_name" is the name
+of the desired printer.
+     </para>
+  <programlisting>
+  <![ CDATA [
+# escputil -c
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it 
+under certain conditions; type 'escputil -l' for details. 
+
+Cleaning heads...
+    ]]>
+  </programlisting>
+     <para>
+       Nothing will be printed on the paper.  The printer will make
+some noise as it cleans the print head.  Wait until the printer is
+finished cleaning the print head.  Afterwards, execute another nozzle
+check and insure that the print head is indeed completely clean.  Note
+that the process of cleaning the print head causes ink consumption, so
+do not clean the print head any more than necessary.
+     </para>
+     <para>
+For severely clogged nozzles, one may have to execute two or three cycles
+of nozzle check followed by a cleaning of the print head.  If the
+printer had gone unused for a long time, the nozzles may be so clogged
+with dried ink as to be unrecoverable, in which case, the best course
+of action is to replace the ink cartridge.
+     </para>
+   </sect2>
+
+   <sect2><title>Align the Print Head</title>
+     <para>
+       To insure the highest quality printouts, the print head must
+be in proper physical alignment.  One can check and realign the print
+head by running this interactive alignment test.  
+     </para>
+     <para>
+The <emphasis>escputil</emphasis> utility must know the exact printer model in
+use.  One may specify the model on the command line using the "-m"
+switch, or the utility can detect the printer model if the user passes
+the "-r" switch and the name of the raw printer device.  
+     </para>
+     <para>
+Note that an unprivileged user may use this command with the "-m" switch, but that
+(in general) the root user may only use the "-r" switch (which
+requires read/write access to the raw printer device).  In the case of
+multiple printers in use, the "-P" switch is required to align the
+print head on the non-default printer.
+     </para>
+
+     <caution>
+     <title>Caution</title>
+     <para>
+This utility lets you align the print head of your Epson Stylus inkjet
+printer.  Misuse of this utility may cause your print quality to degrade
+and possibly damage your printer.  This utility has not been reviewed by
+Seiko Epson for correctness, and is offered with no warranty at all.  The
+entire risk of using this utility lies with you.
+     </para>
+     </caution>
+
+     <para>
+       Aligning the print head is an interactive process.  The utility
+will print out a set of instructions and ask you for responses.  Please
+read the instructions carefully and follow them precisely.  A single
+sheet of paper will be needed (one can print on both sides to save paper).
+     </para>
+     <para>
+The following example illustrates the alignment process when issued by an
+unprivileged user who specified the printer model on the command
+line.  (To obtain a list of printer models, issue the "escputil -M"
+command).  Of course, your responses will vary and should be
+substituted for the responses shown in the following example.
+     </para>
+  <programlisting>
+  <![ CDATA [
+
+*** NOTE - 870 is an illustrative example! ***
+*** You MUST use the proper printer model! ***
+*** Run:  escputil -M for a listing of     ***
+*** supported printer models!              ***
+
+linuxpc> escputil -a -m 870
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Please read these instructions very carefully before proceeding.
+
+This utility lets you align the print head of your Epson Stylus 
+inkjet printer.  Misuse of this utility may cause your print 
+quality to degrade and possibly damage your printer.  This utility
+has not been reviewed by Seiko Epson for correctness, and is 
+offered with no warranty at all.  The entire risk of using this 
+utility lies with you.
+
+This utility prints 3 test patterns.  Each pattern looks very
+similar.  The patterns consist of a series of pairs of vertical
+lines that overlap.  Below each pair of lines is a number between 
+1 and 15.
+
+When you inspect the pairs of lines, you should find the pair
+of lines that is best in alignment, that is, that best forms 
+a single vertical line.  Inspect the pairs very carefully to 
+find the best match.  Using a loupe or magnifying glass is 
+recommended for the most critical inspection.  It is also 
+suggested that you use a good quality paper for the test, so 
+that the lines are well-formed and do not spread through the 
+paper.  After picking the number matching the best pair, place 
+the paper back in the paper input tray before typing it in.
+
+Each pattern is similar, but later patterns use finer dots for
+more critical alignment.  You must run all of the passes to 
+correctly align your printer.  After running all the alignment
+passes, the alignment patterns will be printed once more.  You 
+should find that the middle-most pair (#8 out of the 15) is the
+best for all patterns. 
+
+After the passes are printed once more, you will be offered the
+choices of (s)aving the result in the printer, (r)epeating the
+process, or (q)uitting without saving.  Quitting will not restore
+the previous settings, but powering the printer off and back 
+on will.  If you quit, you must repeat the entire process if 
+you wish to later save the results.  It is essential that you 
+not turn your printer off during this procedure.
+
+This procedure assumes that your printer is an Epson Stylus Photo
+870.  If this is not your printer model, please type control-C now
+and choose your actual printer model.
+
+Please place a sheet of paper in your printer to begin the head
+alignment procedure. 
+Press enter to continue > 
+Please inspect the print, and choose the best pair of lines in 
+each pattern.  Type a pair number, '?' for help, or 'r' to repeat
+the procedure.
+Pass #1> 8
+Pass #2> 8
+Pass #3> 8
+Attempting to set alignment...succeeded.
+Please verify that the alignment is correct.  After the alignment
+pattern is printed again, please ensure that the best pattern 
+for each line is pattern 8.  If it is not, you should repeat the 
+process to get the best quality printing. 
+Please insert a fresh sheet of paper.
+Press enter to continue > 
+Please inspect the final output very carefully to ensure that your
+printer is in proper alignment. You may now: 
+  (s)ave the results in the printer,
+  (q)uit without saving the results, or
+  (r)epeat the entire process from the beginning.
+You will then be asked to confirm your choice.
+What do you want to do (s, q, r)?
+> s
+This will permanently alter the configuration of your printer.
+WARNING: this procedure has not been approved by Seiko Epson, 
+and it may damage your printer. Proceed? 
+Please confirm by typing 's' again that you wish to save the 
+settings to your printer: 
+> s
+About to save settings...succeeded!
+Your alignment settings have been saved to the printer.
+    ]]>
+  </programlisting>
+    <para>
+      The following example shows what will happen if an unprivileged
+user attempts to align the print head by specifying the raw printer
+device on the command line.
+    </para>
+
+  <programlisting>
+  <![ CDATA [
+linuxpc> escputil -a -r /dev/usb/lp0
+Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Attempting to detect printer model...
+Cannot open /dev/usb/lp0 read/write: Permission denied
+    ]]>
+  </programlisting>
+
+    <para>
+      This next example illustrates the results obtained when the root
+user issues an alignment command while specifying the raw printer
+device.  Note that the output is truncated and only shows the printer
+detection output.
+    </para>
+
+  <programlisting>
+  <![ CDATA [
+# escputil -a -r /dev/usb/lp0
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+Attempting to detect printer model...Stylus Photo 870
+
+Please read these instructions very carefully before proceeding.
+    ]]>
+  </programlisting>
+
+   </sect2>
+
+   <sect2><title>Printer Identification</title>
+     <para>
+       The printer identification command will query the printer for
+make and model information.  This command requires read/write access
+to the raw printer device (generally limited to the root user).
+Substitute your own raw printer device in place of the /dev/usb/lp0
+shown in the example.  The output will vary depending on the precise
+printer model.
+     </para>
+
+  <programlisting>
+  <![ CDATA [
+# escputil -d -r /dev/usb/lp0
+Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
+Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
+'escputil -l'
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'escputil -l' for details.
+
+@EJL ID
+MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
+EPSON Stylus Photo 870;
+    ]]>
+  </programlisting>
+
+   </sect2>
+
+   <sect2><title>More Information</title>
+     <para>
+       For more detailed information about the command line switches
+accepted by the <emphasis>escputil</emphasis> utility, please consult
+the man page which is supplied with the Gutenprint software.  The user
+may also issue the "escputil --help" command to get a listing of supported
+command line switches.  The command requires no special privileges to execute.
+     </para>
+
+   </sect2>
+
+  </sect1>
+
+ </chapter>
diff --git a/include/Makefile.in b/include/Makefile.in
index d502a69..bae3aba 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -250,6 +253,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -624,9 +628,6 @@ uninstall-info: uninstall-info-recursive
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index 339a3e6..4e45fe9 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -258,6 +261,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -601,9 +605,6 @@ uninstall-am: uninstall-info-am uninstall-nodist_pkgincludeHEADERS \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 103da04..18019e9 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $"
+ * "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -192,6 +192,8 @@ typedef struct
   void  (*media_size)(const stp_vars_t *v, int *width, int *height);
   void  (*imageable_area)(const stp_vars_t *v,
 			  int *left, int *right, int *bottom, int *top);
+  void  (*maximum_imageable_area)(const stp_vars_t *v, int *left, int *right,
+				  int *bottom, int *top);
   void  (*limit)(const stp_vars_t *v, int *max_width, int *max_height,
                  int *min_width, int *min_height);
   int   (*print)(const stp_vars_t *v, stp_image_t *image);
@@ -232,5 +234,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $".
+ * End of "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
  */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index 57f9ae7..aacdbc1 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -1268,6 +1268,33 @@ extern void stp_get_imageable_area(const stp_vars_t *v, int *left, int *right,
 				   int *bottom, int *top);
 
 /**
+ * Get the maximum imagable area of the page.
+ * Retrieve the maximum (regardless of settings other than page sise)
+ * boundaries of the printable area of the page.  In combination
+ * with the media size, this can be used to determine the actual printable
+ * region, which callers can use to place the image precisely.  The
+ * dimensions are relative to the top left of the physical page.
+ *
+ * If a customizable page size is used (see stp_printer_get_media_size),
+ * the actual desired width and/or height must be filled in using
+ * stp_set_page_width and/or stp_set_page_height.  If these are not filled
+ * in, the margins will be returned.
+ *
+ * Returned values may be negative if a printer is capable of full bleed
+ * by printing beyond the physical boundaries of the page.
+ *
+ * If the media size stored in V is invalid, the return values
+ * will be indeterminate.  It is up to the user to specify legal values.
+ * @param v the vars to use.
+ * @param left a pointer to a int to store the left edge in.
+ * @param right a pointer to a int to store the right edge in.
+ * @param bottom a pointer to a int to store the bottom edge in.
+ * @param top a pointer to a int to store the top edge in.
+ */
+extern void stp_get_maximum_imageable_area(const stp_vars_t *v, int *left,
+					   int *right, int *bottom, int *top);
+
+/**
  * Get the media size limits.
  * Retrieve the minimum and maximum size limits for custom media sizes
  * with the current printer settings.
@@ -1353,5 +1380,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.2 2005/04/09 13:59:17 rlk Exp $".
+ * End of "$Id: vars.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
  */
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index c8d50be..5cf92af 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -254,6 +257,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -547,9 +551,6 @@ uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 2598115..5eea924 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -255,6 +258,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -558,9 +562,6 @@ uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 45cad85..d779926 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -143,7 +143,7 @@ changequote([,])dnl
 ], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
             gt_cv_func_gnugettext_libc=yes,
             gt_cv_func_gnugettext_libc=no)])
 
@@ -179,7 +179,7 @@ extern
 #endif
 const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
@@ -200,7 +200,7 @@ extern
 #endif
 const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index dfb40c0..8d5e72f 100644
--- a/m4/stp_release.m4
+++ b/m4/stp_release.m4
@@ -24,6 +24,6 @@
 # Makefiles.
 AC_DEFUN([STP_RELEASE_DATE],
 [dnl Set package release date
-RELEASE_DATE="22 Jan 2006"
+RELEASE_DATE="14 May 2006"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/m4extra/glib.m4 b/m4extra/glib.m4
new file mode 100644
index 0000000..b8094bb
--- /dev/null
+++ b/m4extra/glib.m4
@@ -0,0 +1,196 @@
+# 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
+])
diff --git a/man/Makefile.in b/man/Makefile.in
index 07dc610..f17d1db 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -251,6 +254,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -605,9 +609,6 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/man/cups-genppdupdate.8.in b/man/cups-genppdupdate.8.in
index 80804f0..9f4e70b 100644
--- a/man/cups-genppdupdate.8.in
+++ b/man/cups-genppdupdate.8.in
@@ -1,4 +1,4 @@
-.\" $Id: cups-genppdupdate.8.in,v 1.4 2004/09/17 18:38:02 rleigh Exp $
+.\" $Id: cups-genppdupdate.8.in,v 1.5 2006/03/29 02:35:25 rlk Exp $
 .\" Copyright (C) 2000 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,11 @@ cups\-genppdupdate \- update CUPS+Gutenprint PPD files
 .B cups\-genppdupdate
 [\fI\-h\fP]
 [\fI\-n\fP]
+[\fI\-N\fP]
 [\fI\-q\fP | \fI\-v\fP]
 [\fI\-s ppd-directory\fP]
+[\fI\-s output-directory\fP]
+[\fIPPD-FILES or QUEUES...\fP]
 .SH DESCRIPTION
 \fBcups\-genppdupdate\fP regenerates the \fIGutenprint\fP PPD files in use by
 CUPS, using the PPD files under \fI@cups_conf_datadir@/model/gutenprint\fP as
@@ -30,8 +33,17 @@ templates.  The new PPD file replaces the old PPD file under
 \fI@cups_conf_serverroot@/ppd\fP, but all the options set in the old PPD will
 be merged into the new PPD, provided that they are still valid in the new file.
 .PP
-cups\-genppdupdate does \fBnot\fP restart cupsd.  cupsd will need manually
-reloading (or send SIGHUP) once cups\-genppdupdate has completed.
+If no files or queue names are specified, \fBcups\-genppdupdate\fP updates all
+Gutenprint PPD files in \fI@cups_conf_serverroot@/ppd\fP.  Otherwise,
+\fBcups\-genppdupdate\fP updates all files or queues listed on the command
+line.
+.PP
+\fBcups\-genppdupdate\fP does not update Foomatic PPD files or PPD files from
+Gimp-Print 4.2 or earlier.
+.PP
+\fBcups\-genppdupdate\fP does \fBnot\fP restart cupsd.  cupsd will need
+manually reloading (or send SIGHUP) once \fBcups\-genppdupdate\fP has
+completed.
 .SH OPTIONS
 .TP
 .B \-h
@@ -53,12 +65,21 @@ Use \fIppd-directory\fP as the base directory to read PPD files from.  By
 default, the base directory is \fP@cups_conf_datadir@/model/gutenprint\fP.
 Under this directory, the PPD files are located in subdirectories according to
 language code and territory.
+.TP
+.B \-o \fIoutput-directory\fP
+Place updated PPD files in \fIoutput-directory\fP.  By default, this is the
+same as the input directory.
+.TP
+.B \-N
+Reset all options to their defaults (do not merge options from the current PPD
+file)
 .SH SEE ALSO
 .BR cups\-genppd (8),
 .BR cups\-genppdconfig (8),
 CUPS Software Administrators Manual, http://localhost:631/documentation.html
 .SH COPYRIGHT
-Copyright \(co  2002\-2003 Roger Leigh (rleigh@debian.org)
+Copyright \(co  2002\-2006 Roger Leigh (rleigh@debian.org) and Robert Krawitz
+(rlk@alum.mit.edu)
 .PP
 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
diff --git a/po/cs.gmo b/po/cs.gmo
index 5777e2a..9d4f71b 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index f058d6f..a6d3c0f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.6-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
-"PO-Revision-Date: 2003-05-03 19:43+0200\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"PO-Revision-Date: 2006-05-04 07:18-0400\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -78,12 +78,12 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -140,207 +140,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Normální papír"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Normální papír"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Fólie"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Listy tkaniny"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Obálka"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Papír pro vysoká rozlišení"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Obtisk na tri�ko"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Potah s vysokým leskem"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Lesklý fotopapír"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Lesklé foto karty"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Profesionální fotopapír"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -348,16 +348,16 @@ msgstr "Profesionální fotopapír"
 msgid "Other"
 msgstr "Jiný"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -374,57 +374,57 @@ msgstr "Velikost"
 msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Velikost papíru, na který chcete tisknout"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -433,21 +433,21 @@ msgstr "Typ inkoustu"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -457,14 +457,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tiskárny:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -474,168 +474,169 @@ msgstr "Model tiskárny:"
 msgid "Core Parameter"
 msgstr "Papír ColorLife"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Světle fialová"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Automatický podava� listů"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Ru�ní s přestávkou"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Ru�ní bez přestávky"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Matný papír"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Černá"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Fotografické barvy CcMmYK"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "Barvy CMY"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Fotografické barvy CcMmY"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "Barvy CMYK"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Fotografické barvy CcMmY"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "Barvy CMY"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Fotografické barvy CcMmYK"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Černá"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -837,14 +838,15 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -853,14 +855,15 @@ msgstr "Modrozelená"
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -869,14 +872,15 @@ msgstr "Fialová"
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -885,10 +889,10 @@ msgstr "Žlutá"
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -907,10 +911,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1153,232 +1157,259 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s není platný parametr typu %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Velikost obrázku není platná\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standardní"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Ru�ní výběr"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Ru�ní"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Podava�"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapír"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr "Ru�ní výběr"
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Výška:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografie"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papír"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Černá"
@@ -1566,137 +1597,137 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1782,70 +1813,70 @@ msgstr "Å est barev foto"
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny ve foto kvalitě"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1856,8 +1887,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2273,62 +2304,88 @@ msgstr "1200 DPI nejvyšší kvalita"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1200 DPI nejvyšší kvalita"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1200 DPI nejvyšší kvalita"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1200 DPI nejvyšší kvalita"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1200 DPI nejvyšší kvalita"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -2416,7 +2473,8 @@ msgid "4x6"
 msgstr "4×6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2906,1526 +2964,3240 @@ msgid "Wide Postcard"
 msgstr "Pohlednice"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "Rolovaný papír 89 mm"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "Rolovaný papír 5 palců"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "Rolovaný papír 210 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "Rolovaný papír 22 palce"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "Rolovaný papír 24 palce"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "Rolovaný papír 44 palce"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C41ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C41ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C41ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C42ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C42ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C42ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C50"
+msgid "Epson Stylus C41"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C50"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C50"
+msgid "Epson Stylus C42"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C61"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C62"
+msgid "Epson Stylus C43"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C50"
+msgid "Epson Stylus C44"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C82"
+msgid "Epson Stylus C48"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
-msgstr "Stylus C50"
+msgid "Epson Stylus C61"
+msgstr "Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
-msgstr "Stylus C60"
+msgid "Epson Stylus C62"
+msgstr "Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C50"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C50"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C50"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C50"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C50"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C50"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C50"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C50"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C50"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C50"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C50"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C50"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C50"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C50"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C50"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C50"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C50"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C50"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C50"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C50"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C50"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Definovat novou tiskárnu"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Definovat novou tiskárnu"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Definovat novou tiskárnu"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Definovat novou tiskárnu"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Název tiskárny:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Nastavit tiskárnu"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5128,78 +6900,78 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Název tiskárny:"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Příkaz:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Podava� 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Podava� 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Podava� 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Podava� 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testovací tisk"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Czech"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Verze escputil "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5209,9 +6981,10 @@ msgstr ""
 "Toto je svobodný software, a můžete jej dále šířit za ur�itých podmínek;\n"
 "pro detaily napište 'escputil -l'.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5243,11 +7016,12 @@ msgstr ""
 "pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
 "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5285,6 +7059,8 @@ msgid ""
 "    -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 ""
 "Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P tiskárna | -r zařízení] [-u] [-q] [-m model]\n"
@@ -5324,12 +7100,13 @@ 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:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5364,6 +7141,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Použití: escputil [PŘEP�NAČE] [PŘ�KAZ]\n"
 "Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5402,74 +7181,84 @@ msgstr ""
 "    -q Potla�it hlavi�ku.\n"
 "    -m Ur�ení přesného modelu pro zarovnání hlav.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Můžete zadat jen jednu tiskárnu nebo přímé zařízení."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Neznámý přepína� %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nemohu otevřít zařízení %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nemohu odeslat příkaz tiskárně\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nemohu �íst z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, 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:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5478,15 +7267,7 @@ msgstr ""
 "\n"
 "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5497,82 +7278,224 @@ msgstr ""
 "Nemohu detekovat typ tiskárny.\n"
 "Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
 #, 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"
+msgid "Status: Waiting\n"
+msgstr "Sytost:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Barva inkoustu"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Tiskárna nepodporuje barevný výstup\n"
+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:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistím hlavy...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spouštím test trysek, přesvěd�te se prosím, že v tiskárně je papír.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5645,7 +7568,7 @@ msgstr ""
 "abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5709,12 +7632,17 @@ msgstr ""
 "Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nemohu odeslat příkaz tiskárně, kon�ím.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5733,13 +7661,13 @@ msgstr ""
 "Pak budete požádáni o potvrzení svého výběru.\n"
 "Co chcete udělat (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5747,7 +7675,7 @@ msgstr ""
 "Potvr�te prosím, že chcete skon�it bez ukládání, opětovným\n"
 "napsáním 'q':\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5756,7 +7684,7 @@ msgstr ""
 "Dobře, vaše tiskárna je zarovnaná, ale zarovnání nebylo uloženo.\n"
 "Pokud chcete zarovnání uložit, musíte tento proces zopakovat.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5765,12 +7693,12 @@ msgstr ""
 "Potvr�te prosím, že chcete zopakovat proces zarovnávání, opětovným\n"
 "napsáním 'r':\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5785,17 +7713,17 @@ msgstr ""
 "Potvr�te prosím, že chcete uložit nastavení do své tiskárny, opětovným\n"
 "napsáním 's':\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Připravuji se uložit nastavení..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "selhalo!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5804,27 +7732,27 @@ msgstr ""
 "Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
 "zarovnávání.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "uspělo!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vaše nastavení zarovnání bylo uloženo do tiskárny.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Poslední příkaz nebyl potvrzen.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5841,12 +7769,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:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Pokra�ujte stisknutím enter > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5856,42 +7784,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:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Průchod #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, 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:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo mimo rozsah!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nemohu pochopit, co jste napsali!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokouším se nastavit zarovnání..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspělo.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5904,7 +7832,7 @@ msgstr ""
 "vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
 "zopakovat.\n"
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba ve vstupu\n"
@@ -5913,11 +7841,11 @@ msgstr "Chyba ve vstupu\n"
 msgid "Printing..."
 msgstr "Tisknu..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
-msgstr "<Obrázek>/Soubor/Tisk..."
+msgstr "<Image>/Soubor/Tisk..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5929,483 +7857,562 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Špatný prostor barev: bps %d kanálů %d prostor %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Žádná vyrovnávací paměť řádků\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Nemohu zpracovat parametr %s=%s (o�ekávám �íslo)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Tiskárna musí být ur�ena pomocí -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Tiskárna %s není známý model\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header selhalo %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init selhalo %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Nemohu otevřít deskriptor souboru: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Špatné parametry; nemohu pokra�ovat!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Nemohu zpracovat výstup z tiskárny\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Žlutá"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Žlutá"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Zarovnání tiskárny musí být provedeno s přímým zařízením\n"
-#~ "nebo musí být použit přepína� -m pro ur�ení tiskárny.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Pokouším se detekovat model tiskárny..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nemohu otevřít %s pro �tení i zápis: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Model tiskárny %s není znám.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "O Gimp-Print "
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Jas tisku.\n"
-#~ "0 je úplně �erná, 2 je úplně bílá"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Zadejte správný příkaz pro tisk na svou tiskárnu. Poznámka: Neodstraňujte "
-#~ "prosím z řetězce příkazu `-l' nebo `-oraw', jinak tisk pravděpodobně "
-#~ "selže!"
-
-#~ msgid "PPD File?"
-#~ msgstr "Soubor PPD?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: přepína� `%s' není jednozna�ný\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: přepína� `--%s' musí být zadán bez argumentu\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: přepína� `%c%s' musí být zadán bez argumentu\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: přepína� `%s' vyžaduje argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: neznámý přepína� `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: neznámý přepína� `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: neznámý přepína� -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neznámý přepína� -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: přepína� vyžaduje argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: přepína� `-W %s' není jednozna�ný\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: přepína� `-W %s' musí být zadán bez argumentu\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Jas:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Upravit tisk na velikost stránky"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Podávací válec"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "360 DPI Jednosměrně"
-
-#~ msgid "24x36"
-#~ msgstr "24×36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f z %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header selhalo %d\n"
 
 #, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimalizovat výstup pro typ tištěného obrázku"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Jednolité barvy"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C41sx"
-
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C41ux"
-
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C42sx"
-
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C42ux"
-
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C50"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C61"
+#, fuzzy
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C61"
 
-#~ msgid "Stylus C62"
+#, fuzzy
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C62"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus C82"
+#, fuzzy
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C82"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
-#~ msgid "Stylus Photo 830"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 830"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo 915"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 915"
 
-#~ msgid "Stylus Photo 925"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 925"
 
-#~ msgid "Stylus Photo 950"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 950"
 
-#~ msgid "Stylus Photo 960"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 960"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
-#~ msgid "Stylus Photo 2100"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 2100"
 
-#~ msgid "Stylus Photo 2200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 2200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
-#~ msgid "Stylus Pro 7600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7600"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
-#~ msgid "Stylus Pro 9600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9600"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C50"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Tiskárna nepodporuje barevný výstup\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nemohu zpracovat výstup z tiskárny\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Žlutá"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Žlutá"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "Zarovnání tiskárny musí být provedeno s přímým zařízením\n"
+#~ "nebo musí být použit přepína� -m pro ur�ení tiskárny.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Pokouším se detekovat model tiskárny..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nemohu otevřít %s pro �tení i zápis: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "Model tiskárny %s není znám.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "O Gimp-Print "
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "Jas tisku.\n"
+#~ "0 je úplně �erná, 2 je úplně bílá"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Zadejte správný příkaz pro tisk na svou tiskárnu. Poznámka: Neodstraňujte "
+#~ "prosím z řetězce příkazu `-l' nebo `-oraw', jinak tisk pravděpodobně "
+#~ "selže!"
+
+#~ msgid "PPD File?"
+#~ msgstr "Soubor PPD?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: přepína� `%s' není jednozna�ný\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: přepína� `--%s' musí být zadán bez argumentu\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: přepína� `%c%s' musí být zadán bez argumentu\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: přepína� `%s' vyžaduje argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: neznámý přepína� `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: neznámý přepína� `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neznámý přepína� -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: neznámý přepína� -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: přepína� vyžaduje argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: přepína� `-W %s' není jednozna�ný\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: přepína� `-W %s' musí být zadán bez argumentu\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Jas:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Upravit tisk na velikost stránky"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Podávací válec"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "360 DPI Jednosměrně"
+
+#~ msgid "24x36"
+#~ msgstr "24×36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f z %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "Optimalizovat výstup pro typ tištěného obrázku"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Jednolité barvy"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C41sx"
+
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C41ux"
+
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C42sx"
+
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C42ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/da.gmo b/po/da.gmo
index 30bd928..997b34a 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 25303ec..4adfea9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,44 +1,47 @@
+# translation of da.po to Danish
+# translation of gutenprint.po to Danish
+# translation of da8.po to Danish
 # Danish translation of gutenprint.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Mogens Jaeger <mogensjaeger@get2net.dk>, 2005.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+# Mogens Jaeger <mogensjaeger@get2net.dk>, 2005, 2006.
 # Keld Simonsen <keld@dkuug.dk>, 2001.
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint 5.0.0-b5\n"
+"Project-Id-Version: gutenprint 5.0.0-b6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
-"PO-Revision-Date: 2005-08-17 16:11+0200\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"PO-Revision-Date: 2006-05-04 07:21-0400\n"
 "Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Danish\n"
 "X-Poedit-Country: DENMARK\n"
-"X-Generator: KBabel 1.10\n"
+"X-Generator: KBabel 1.10.2\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr "Standard"
 
 #: src/main/dither-main.c:47
 msgid "EvenTone"
-msgstr "JævnTone"
+msgstr "JævnTone"
 
 #: src/main/dither-main.c:48
 msgid "Hybrid EvenTone"
-msgstr "Blandet JævnTone"
+msgstr "Blandet JævnTone"
 
 #: src/main/dither-main.c:54
 msgid "EvenBetter"
-msgstr "JævnBedre"
+msgstr "JævnBedre"
 
 #: src/main/dither-main.c:55
 msgid "Hybrid EvenBetter"
-msgstr "Blandet JævnBedre"
+msgstr "Blandet JævnBedre"
 
 #: src/main/dither-main.c:61
 msgid "UniTone"
@@ -74,14 +77,14 @@ msgstr "Forud dithered inddata"
 
 #: src/main/dither-main.c:89 src/main/print-color.c:56
 msgid "Density"
-msgstr "Tæthed"
-
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+msgstr "Tæthed"
+
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -97,9 +100,9 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Justér udskriftens tæthed (blækmængde). Reducér tætheden hvis blækket "
-"trækker igennem papiret, eller hvis det flyder ud. Øg tætheden hvis de sorte "
-"områder ikke er gennemfarvet."
+"Justér udskriftens tæthed (blækmængde). Reducér tætheden hvis blækket "
+"trækker igennem papiret, eller hvis det flyder ud. Øg tætheden hvis de sorte "
+"områder ikke er gennemfarvet."
 
 #: src/main/dither-main.c:98
 msgid "Dither Algorithm"
@@ -120,11 +123,11 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"Vælg den ditherings-algoritme der skal bruges.\n"
-"Tilpasset Blandet giver sædvanligvis den bedste all-round kvalitet.\n"
-"JævnTone er en ny eksperimentel algoritme, der ofte giver excellente "
+"Vælg den ditherings-algoritme der skal bruges.\n"
+"Tilpasset Blandet giver sædvanligvis den bedste all-round kvalitet.\n"
+"JævnTone er en ny eksperimentel algoritme, der ofte giver excellente "
 "resultater.\n"
-"Ordnet er hurtig og giver en næsten lige så god fotokvalitet.\n"
+"Ordnet er hurtig og giver en næsten lige så god fotokvalitet.\n"
 "Hurtig og Meget Hurtig er betragteligt hurtigere, og fungerer godt med tekst "
 "og streg kunst.\n"
 "Blandet Floyd-Steinberg giver generelt ringere kvalitet."
@@ -139,187 +142,187 @@ msgstr "Driverfamilie"
 
 #: src/main/module.c:54
 msgid "Color conversion module"
-msgstr "Farveomsætningsmodul"
+msgstr "Farveomsætningsmodul"
 
 #: src/main/module.c:55
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI"
 msgstr "90x90 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI DMT"
 msgstr "90x90 DPI DMT"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI"
 msgstr "180x180 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI DMT"
 msgstr "180x180 DPI DMT"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI"
 msgstr "360x360 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI DMT"
 msgstr "360x360 DPI DMT"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI"
 msgstr "720x360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI DMT"
 msgstr "720x360 DPI DMT"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI"
 msgstr "720x720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI DMT"
 msgstr "720x720 DPI DMT"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI"
 msgstr "1440x720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI DMT"
 msgstr "1440x720 DPI DMT"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI"
 msgstr "1440x1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI DMT"
 msgstr "1440x1440 DPI DMT"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI"
 msgstr "2880x2880 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI DMT"
 msgstr "2880x2880 DPI DMT"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI DMT"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI DMT"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI DMT"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI DMT"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI DMT"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI"
 msgstr "1200x1200 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI DMT"
 msgstr "1200x1200 DPI DMT"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI"
 msgstr "2400x2400 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Almindeligt papir"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 msgid "Plain Paper PIXMA"
 msgstr "Almindeligt papir PIXMA"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparenter"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Bagside-printfilm"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Stofark"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Kuvert"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
-msgstr "Højopløsningspapir"
+msgstr "Højopløsningspapir"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
-msgstr "T-shirt overføring"
+msgstr "T-shirt overføring"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
-msgstr "Højglansfilm"
+msgstr "Højglansfilm"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Blankt fotopapir"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Blanke fotokort"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Prof. fotopapir"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -327,15 +330,15 @@ msgstr "Prof. fotopapir"
 msgid "Other"
 msgstr "Andet"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
-msgstr "Papirstørrelse"
+msgstr "Papirstørrelse"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -351,78 +354,78 @@ msgstr "Papirstørrelse"
 msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
-msgstr "Størrelse på det papir der skal udskrives på"
+msgstr "Størrelse på det papir der skal udskrives på"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
-msgstr "Opløsning"
+msgstr "Opløsning"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
-msgstr "Opløsning og kvalitet af udskriften"
+msgstr "Opløsning og kvalitet af udskriften"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
-msgstr "Blæktype"
+msgstr "Blæktype"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
 #: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
-msgstr "Avanceret printeropsætning"
+msgstr "Avanceret printeropsætning"
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "Blæktype i printeren"
+msgstr "Blæktype i printeren"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
-msgstr "Blækkanaler"
+msgstr "Blækkanaler"
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -432,13 +435,13 @@ msgstr "Blækkanaler"
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -447,164 +450,164 @@ msgstr "Printningstilstand"
 msgid "Core Parameter"
 msgstr "Kerneparameter"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble indstilling"
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
-msgstr "Tæthed for cyan"
+msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
-msgstr "Justér tæthed for cyan"
+msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
-msgstr "Tæthed for magenta"
+msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
-msgstr "Justér tæthed for magenta"
+msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
-msgstr "Tæthed for gul"
+msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
-msgstr "Justér tæthed for gul"
+msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
-msgstr "Tæthed for sort"
+msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
-msgstr "Justér tæthed for sort"
+msgstr "Justér tæthed for sort"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
-msgstr "Avanceret blækjustering"
+msgstr "Avanceret blækjustering"
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr "Afbrudt"
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
-msgstr "Automatisk arkføder"
+msgstr "Automatisk arkføder"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
-msgstr "Manuel fødning med pause"
+msgstr "Manuel fødning med pause"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
-msgstr "Manuel fødning uden pause"
+msgstr "Manuel fødning uden pause"
 
-#: src/main/print-canon.c:1904
-#, fuzzy
+#: src/main/print-canon.c:1923
 msgid "Cassette"
-msgstr "Mat"
+msgstr "Kassette"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
-msgstr ""
+msgstr "CD skuffe"
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Sort"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Foto CcMmYK farver"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY farver"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Foto CcMmY farver"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK farver"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY farver"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY farver"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK farver"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Sort"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Sort og hvid"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
-msgstr "Høj præcision"
+msgstr "Høj præcision"
 
 #: src/main/print-color.c:51
 msgid "Bright Colors"
@@ -612,7 +615,7 @@ msgstr "Lyse klare farver"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
-msgstr "Korrigér kun farvetone"
+msgstr "Korrigér kun farvetone"
 
 #: src/main/print-color.c:53
 msgid "Uncorrected"
@@ -620,11 +623,11 @@ msgstr "Ikke farvekorrigeret"
 
 #: src/main/print-color.c:54
 msgid "Desaturated"
-msgstr "Ikke mættet"
+msgstr "Ikke mættet"
 
 #: src/main/print-color.c:55
 msgid "Threshold"
-msgstr "Tærskelværdi"
+msgstr "Tærskelværdi"
 
 #: src/main/print-color.c:57 src/main/print-color.c:133
 msgid "Raw"
@@ -638,7 +641,7 @@ msgstr "Forud dithered"
 #: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
-msgstr "Gråtone"
+msgstr "Gråtone"
 
 #: src/main/print-color.c:123
 msgid "Whitescale"
@@ -679,7 +682,7 @@ msgstr "Gamma"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
-msgstr "Gammaværdi for ufiltreret kanal "
+msgstr "Gammaværdi for ufiltreret kanal "
 
 #: src/main/print-color.c:176
 msgid "Color Correction"
@@ -725,13 +728,12 @@ msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
 #: src/main/print-color.c:216
-#, fuzzy
 msgid "SimpleGamma"
-msgstr "Program gamma"
+msgstr "Simpel-gamma"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Ingen korrektion for skærm-gamma"
 
 #: src/main/print-color.c:224
 msgid "Brightness"
@@ -747,11 +749,11 @@ msgstr "Kontrast"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
-msgstr "Udskriftens kontrast (0 giver en ren grå flade)"
+msgstr "Udskriftens kontrast (0 giver en ren grå flade)"
 
 #: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
-msgstr "Lineær kontrastjustering"
+msgstr "Lineær kontrastjustering"
 
 #: src/main/print-color.c:240
 msgid "Advanced Image Control"
@@ -759,7 +761,7 @@ msgstr "Avanceret billedkontrol"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
-msgstr "Brug lineær kontra fastholdt endepunkts-kontrastjustering"
+msgstr "Brug lineær kontra fastholdt endepunkts-kontrastjustering"
 
 #: src/main/print-color.c:248
 msgid "Composite Gamma"
@@ -770,8 +772,8 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Justér udskriftens gamma. Større værdier giver et generelt lysere resultat, "
-"mens mindre værdier giver et generelt mørkere resultat. "
+"Justér udskriftens gamma. Større værdier giver et generelt lysere resultat, "
+"mens mindre værdier giver et generelt mørkere resultat. "
 
 #: src/main/print-color.c:258
 msgid "AppGamma"
@@ -779,87 +781,90 @@ msgstr "Program gamma"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
-msgstr "Gammaværdi som formodet af program"
-
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+msgstr "Gammaværdi som formodet af program"
+
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
 #: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
-msgstr "Justér gamma for cyan"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+msgstr "Justér gamma for cyan"
+
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
 #: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
-msgstr "Justér gamma for magenta"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+msgstr "Justér gamma for magenta"
+
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Gul"
 
 #: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
-msgstr "Justér gamma for gul"
+msgstr "Justér gamma for gul"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
-msgstr "Rød"
+msgstr "Rød"
 
 #: src/main/print-color.c:291
 msgid "Adjust the red gamma"
-msgstr "Justér gamma for rød"
+msgstr "Justér gamma for rød"
 
 #: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
 #: src/gutenprintui2/panel.c:2158
 msgid "Green"
-msgstr "Grøn"
+msgstr "Grøn"
 
 #: src/main/print-color.c:299
 msgid "Adjust the green gamma"
-msgstr "Justér gamma for grøn"
+msgstr "Justér gamma for grøn"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
-msgstr "Blå"
+msgstr "Blå"
 
 #: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
-msgstr "Justér gamma for blå"
+msgstr "Justér gamma for blå"
 
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
-msgstr "Justér sort gamma"
+msgstr "Justér sort gamma"
 
 #: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
@@ -868,11 +873,11 @@ msgstr "Cyan balance"
 #: src/main/print-color.c:322 src/main/print-color.c:330
 #: src/main/print-color.c:338
 msgid "GrayBalance"
-msgstr "Grå balance"
+msgstr "Grå balance"
 
 #: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
-msgstr "Justér cyans gråbalance"
+msgstr "Justér cyans gråbalance"
 
 #: src/main/print-color.c:330 src/main/print-olympus.c:1338
 msgid "Magenta Balance"
@@ -880,7 +885,7 @@ msgstr "Magenta balance"
 
 #: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
-msgstr "Justér magentas gråbalance"
+msgstr "Justér magentas gråbalance"
 
 #: src/main/print-color.c:338 src/main/print-olympus.c:1346
 msgid "Yellow Balance"
@@ -888,23 +893,23 @@ msgstr "Gul balance"
 
 #: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
-msgstr "Justér guls gråbalance"
+msgstr "Justér guls gråbalance"
 
 #: src/main/print-color.c:346
 msgid "Saturation"
-msgstr "Mætning"
+msgstr "Mætning"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"Justér udskriftens mætning (farve balance)\n"
-"Brug nul-mætning til et gråskalaudskrift med farve og sort blæk"
+"Justér udskriftens mætning (farve balance)\n"
+"Brug nul-mætning til et gråskalaudskrift med farve og sort blæk"
 
 #: src/main/print-color.c:357
 msgid "Ink Limit"
-msgstr "Begræns blækmængde"
+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
@@ -916,7 +921,7 @@ msgstr "Avanceret udskriftskontrol"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
-msgstr "Begræns den samlede mængde blæk der printes på siden"
+msgstr "Begræns den samlede mængde blæk der printes på siden"
 
 #: src/main/print-color.c:365
 msgid "GCR Transition"
@@ -924,23 +929,23 @@ msgstr "GCR overgang"
 
 #: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
-msgstr "Justér den grå bestanddels overgangsniveau"
+msgstr "Justér den grå bestanddels overgangsniveau"
 
 #: src/main/print-color.c:373
 msgid "GCR Lower Bound"
-msgstr "GCR nedre grænse"
+msgstr "GCR nedre grænse"
 
 #: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
-msgstr "Nedre grænse for reduktion af grå bestanddel"
+msgstr "Nedre grænse for reduktion af grå bestanddel"
 
 #: src/main/print-color.c:381
 msgid "GCR Upper Bound"
-msgstr "GCR overgrænse"
+msgstr "GCR overgrænse"
 
 #: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
-msgstr "Overgrænse for reduktion af grå bestanddel"
+msgstr "Overgrænse for reduktion af grå bestanddel"
 
 #: src/main/print-color.c:446
 msgid " Curve"
@@ -992,27 +997,27 @@ msgstr "Sort kurve"
 
 #: src/main/print-color.c:489
 msgid "Red Curve"
-msgstr "Rød kurve"
+msgstr "Rød kurve"
 
 #: src/main/print-color.c:490
 msgid "Red curve"
-msgstr "Rød kurve"
+msgstr "Rød kurve"
 
 #: src/main/print-color.c:497
 msgid "Green Curve"
-msgstr "Grøn kurve"
+msgstr "Grøn kurve"
 
 #: src/main/print-color.c:498
 msgid "Green curve"
-msgstr "Grøn kurve"
+msgstr "Grøn kurve"
 
 #: src/main/print-color.c:505
 msgid "Blue Curve"
-msgstr "Blå kurve"
+msgstr "Blå kurve"
 
 #: src/main/print-color.c:506
 msgid "Blue curve"
-msgstr "Blå kurve"
+msgstr "Blå kurve"
 
 #: src/main/print-color.c:513
 msgid "White Curve"
@@ -1037,11 +1042,11 @@ msgstr "Farvetone justeringskurve"
 
 #: src/main/print-color.c:529
 msgid "Saturation Map"
-msgstr "Mætningsdiagram"
+msgstr "Mætningsdiagram"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
-msgstr "Mætnings justeringskurve"
+msgstr "Mætnings justeringskurve"
 
 #: src/main/print-color.c:537
 msgid "Luminosity Map"
@@ -1053,233 +1058,259 @@ msgstr "Lysintensitets justeringskurve"
 
 #: src/main/print-color.c:545
 msgid "Gray Component Reduction"
-msgstr "Grå bestanddels reduktion"
+msgstr "Grå bestanddels reduktion"
 
 #: src/main/print-color.c:546
 msgid "Gray component reduction curve"
-msgstr "Grå bestanddels reduktionskurve"
+msgstr "Grå bestanddels reduktionskurve"
 
 #: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
-msgstr "Traditionel Gutenprint farveomsætning"
+msgstr "Traditionel Gutenprint farveomsætning"
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
-msgstr "Værdi skal angives for %s\n"
+msgstr "Værdi skal angives for %s\n"
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' er ikke en gyldig %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, 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"
+msgstr "%s skal være mellem %f og %f (er %f)\n"
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, 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"
+msgstr "%s skal være mellem %d og %d (er %d)\n"
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
-msgstr "%s grænser skal være mellem %f og %f\n"
+msgstr "%s grænser skal være mellem %f og %f\n"
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
-msgstr "%s nulstilling tilstand skal være %s\n"
+msgstr "%s nulstilling tilstand skal være %s\n"
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
-msgstr "ingen nulstilling af tæller"
+msgstr "ingen nulstilling af tæller"
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
-msgstr "nulstil tæller"
+msgstr "nulstil tæller"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukendt parametertype %s (%d)\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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"
+msgstr "%s uden for område (værdi %d, min %d, max %d)\n"
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
-msgstr "Arkstørrelse er ikke gyldig\n"
+msgstr "Arkstørrelse er ikke gyldig\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "Top margin må ikke være mindre end %d\n"
+msgstr "Top margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "Venstre margin må ikke være mindre end %d\n"
+msgstr "Venstre margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
-msgstr "Højde skal være større end nul\n"
+msgstr "Højde skal være større end nul\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
-msgstr "Bredde skal være større end nul\n"
+msgstr "Bredde skal være større end nul\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
-"Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant "
+"Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant "
 "er %d\n"
 
-#: src/main/printers.c:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
-"Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
+"Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
 "d\n"
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
-msgstr "Rulle fødning"
+msgstr "Rulle fødning"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
-msgstr "Rulle fødning (skær efter hver side)"
+msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
-msgstr "Rulle fødning (ingen afskæring)"
+msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
-msgstr "Manuel fødning"
+msgstr "Manuel fødning"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 msgid "Print to CD"
-msgstr "Udskriv på Cd"
+msgstr "Udskriv på Cd"
+
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuel udvælgelse"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuel fødning"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Bakke"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Foto sort"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
-msgstr "Tilskårne ark, bakke 1"
+msgstr "Tilskårne ark, bakke 1"
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
-msgstr "Tilskårne ark, bakke 2"
+msgstr "Tilskårne ark, bakke 2"
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
-msgstr "Manuel udvælgelse"
+msgstr "Manuel udvælgelse"
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
-msgstr "Hurtig økonomisk"
+msgstr "Hurtig økonomisk"
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
-msgstr "Økonomisk"
+msgstr "Økonomisk"
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 msgid "High"
-msgstr "Høj"
+msgstr "Høj"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super foto"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Bedst"
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 msgid "Dark Yellow"
-msgstr "Mørk gul"
+msgstr "Mørk gul"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 msgid "Matte Black"
 msgstr "Mat sort"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 msgid "Photo Black"
 msgstr "Foto sort"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
-#, fuzzy
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 msgid "Light Light Black"
-msgstr "Lys sort"
+msgstr "Lys lys-sort"
 
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
@@ -1301,7 +1332,7 @@ msgstr "Udskriftskvalitet"
 
 #: src/main/print-escp2.c:195
 msgid "CD Hub Size"
-msgstr "Cd center størrelse"
+msgstr "Cd center størrelse"
 
 #: src/main/print-escp2.c:196
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
@@ -1313,7 +1344,7 @@ msgstr "Cd vandret finjustering"
 
 #: src/main/print-escp2.c:202 src/main/print-escp2.c:208
 msgid "Fine adjustment to horizontal position for CD printing"
-msgstr "Finjustering i vandret plan til printning på Cd"
+msgstr "Finjustering i vandret plan til printning på Cd"
 
 #: src/main/print-escp2.c:207
 msgid "CD Vertical Fine Adjustment"
@@ -1321,7 +1352,7 @@ msgstr "Cd lodret finjustering"
 
 #: src/main/print-escp2.c:214
 msgid "Resolution of the print"
-msgstr "Udskriftens opløsning"
+msgstr "Udskriftens opløsning"
 
 #: src/main/print-escp2.c:230
 msgid "Enhanced Gloss"
@@ -1329,11 +1360,11 @@ msgstr "Forbedret glans"
 
 #: src/main/print-escp2.c:231
 msgid "Add gloss enhancement"
-msgstr "Tilføj glansforbedring"
+msgstr "Tilføj glansforbedring"
 
 #: src/main/print-escp2.c:236
 msgid "Ink Set"
-msgstr "Blæk sæt"
+msgstr "Blæk sæt"
 
 #: src/main/print-escp2.c:242
 msgid "Printing Direction"
@@ -1345,7 +1376,7 @@ msgstr "Avanceret udskriftsjustering"
 
 #: src/main/print-escp2.c:243
 msgid "Printing direction (unidirectional is higher quality, but slower)"
-msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
+msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
 #: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
@@ -1357,27 +1388,27 @@ msgstr "Print uden margin"
 
 #: src/main/print-escp2.c:254
 msgid "Interleave Method"
-msgstr "Udjævningsmetode"
+msgstr "Udjævningsmetode"
 
 #: src/main/print-escp2.c:255
 msgid "Interleave pattern to use"
-msgstr "Udjævningsmønster der skal bruges"
+msgstr "Udjævningsmønster der skal bruges"
 
 #: src/main/print-escp2.c:260
 msgid "Adjust dot size as necessary"
-msgstr "Justér punktstørrelse som nødvendigt"
+msgstr "Justér punktstørrelse som nødvendigt"
 
 #: src/main/print-escp2.c:261
 msgid "Adjust dot size as necessary to achieve desired density"
-msgstr "Justér punktstørrelse som nødvendigt, for at opnå ønsket tæthed"
+msgstr "Justér punktstørrelse som nødvendigt, for at opnå ønsket tæthed"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
 msgid "Output Order"
-msgstr "Udskriftsrækkefølge"
+msgstr "Udskriftsrækkefølge"
 
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
-msgstr "Retten-ind gennemløb"
+msgstr "Retten-ind gennemløb"
 
 #: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
@@ -1385,11 +1416,11 @@ msgstr "Retten-ind valg"
 
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
-msgstr "Kommando til udskiftning af blækpatron"
+msgstr "Kommando til udskiftning af blækpatron"
 
 #: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
-msgstr "Skiftende retten-ind gennemløb"
+msgstr "Skiftende retten-ind gennemløb"
 
 #: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #: src/main/print-escp2.c:303
@@ -1398,7 +1429,7 @@ msgstr "Skiftende retten-ind valg"
 
 #: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
-msgstr "Understøtter netværkstilstand"
+msgstr "Understøtter netværkstilstand"
 
 #: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 msgid "Channel Names"
@@ -1406,7 +1437,7 @@ msgstr "Kanalnavne"
 
 #: src/main/print-escp2.c:327
 msgid "Raw Channel Count"
-msgstr "Ufiltreret kanal tælling"
+msgstr "Ufiltreret kanal tælling"
 
 #: src/main/print-escp2.c:332
 msgid "Cyan Map"
@@ -1414,7 +1445,7 @@ msgstr "Diagram for cyan"
 
 #: src/main/print-escp2.c:333
 msgid "Adjust the cyan map"
-msgstr "Justér diagram for cyan"
+msgstr "Justér diagram for cyan"
 
 #: src/main/print-escp2.c:338
 msgid "Magenta Map"
@@ -1422,7 +1453,7 @@ msgstr "Diagram for magenta"
 
 #: src/main/print-escp2.c:339
 msgid "Adjust the magenta map"
-msgstr "Justér diagram for magenta"
+msgstr "Justér diagram for magenta"
 
 #: src/main/print-escp2.c:344
 msgid "Yellow Map"
@@ -1430,140 +1461,140 @@ msgstr "Diagram for gul"
 
 #: src/main/print-escp2.c:345
 msgid "Adjust the yellow map"
-msgstr "Justér diagram for gul"
+msgstr "Justér diagram for gul"
 
 #: src/main/print-escp2.c:350
 msgid "Blue Map"
-msgstr "Diagram for blå"
+msgstr "Diagram for blå"
 
 #: src/main/print-escp2.c:351
 msgid "Adjust the blue map"
-msgstr "Justér diagram for blå"
+msgstr "Justér diagram for blå"
 
 #: src/main/print-escp2.c:356
 msgid "Red Map"
-msgstr "Diagram for rød"
+msgstr "Diagram for rød"
 
 #: src/main/print-escp2.c:357
 msgid "Adjust the red map"
-msgstr "Justér diagram for rød"
+msgstr "Justér diagram for rød"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 msgid "Red Density"
-msgstr "Tæthed for rød"
+msgstr "Tæthed for rød"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
-msgstr "Justér tæthed for rød"
+msgstr "Justér tæthed for rød"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 msgid "Blue Density"
-msgstr "Tæthed for blå"
+msgstr "Tæthed for blå"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
-msgstr "Justér tæthed for blå"
+msgstr "Justér tæthed for blå"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 msgid "Adjust the gloss level"
-msgstr "Justér glansniveau"
+msgstr "Justér glansniveau"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
-msgstr "Mørkgul overgang"
+msgstr "Mørkgul overgang"
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
-msgstr "Grå overgang"
+msgstr "Grå overgang"
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
-msgstr "Lysgrå overgang"
+msgstr "Lysgrå overgang"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
-msgstr "Mørkgrå overgang"
+msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
-msgstr "Mellemgrå overgang"
+msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
-msgstr "Middelgrå overgang"
+msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
-msgstr "Vige udenom nærmeste nabo"
+msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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"
+msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n"
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1578,7 +1609,7 @@ msgstr "600 DPI"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 DPI høj kvalitet"
+msgstr "600 DPI høj kvalitet"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -1590,11 +1621,11 @@ msgstr "1200 DPI"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 DPI høj kvalitet"
+msgstr "1200 DPI høj kvalitet"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI højeste kvalitet"
+msgstr "1200 DPI højeste kvalitet"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1606,11 +1637,11 @@ msgstr "2400 DPI x 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI x 1200 DPI høj kvalitet"
+msgstr "2400 DPI x 1200 DPI høj kvalitet"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI højeste kvalitet"
+msgstr "2400 DPI x 1200 DPI højeste kvalitet"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
@@ -1649,70 +1680,70 @@ msgstr "Seks farver foto"
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Blanke film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
-msgstr "Førsteklasses blankt fotopapir"
+msgstr "Førsteklasses blankt fotopapir"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
-msgstr "Førsteklasses glittet fotopapir"
+msgstr "Førsteklasses glittet fotopapir"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets blankt papir"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1723,8 +1754,8 @@ msgstr "Ilford Heavy Papir"
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr "Ingen"
 
@@ -1742,19 +1773,19 @@ msgstr "Mat"
 
 #: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
-msgstr "Lamineret mønster"
+msgstr "Lamineret mønster"
 
 #: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
-msgstr "Justér cyanbalance"
+msgstr "Justér cyanbalance"
 
 #: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
-msgstr "Justér magentabalance"
+msgstr "Justér magentabalance"
 
 #: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
-msgstr "Justér gulbalance"
+msgstr "Justér gulbalance"
 
 #: src/main/print-olympus.c:1354
 msgid "Black Balance"
@@ -1762,7 +1793,7 @@ msgstr "Sort balance"
 
 #: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
-msgstr "Justér sortbalance"
+msgstr "Justér sortbalance"
 
 #: src/main/print-pcl.c:182
 msgid "Plain"
@@ -1774,7 +1805,7 @@ msgstr "Printer papir"
 
 #: src/main/print-pcl.c:184
 msgid "Premium"
-msgstr "Førsteklasses"
+msgstr "Førsteklasses"
 
 #: src/main/print-pcl.c:185
 msgid "Glossy Photo"
@@ -1786,11 +1817,11 @@ msgstr "Gennemsigtighed"
 
 #: src/main/print-pcl.c:187
 msgid "Quick-dry Photo"
-msgstr "Hurtigttørrende foto"
+msgstr "Hurtigttørrende foto"
 
 #: src/main/print-pcl.c:188
 msgid "Quick-dry Transparency"
-msgstr "Hurtigttørrende klar film"
+msgstr "Hurtigttørrende klar film"
 
 #: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
 msgid "Manual"
@@ -1814,11 +1845,11 @@ msgstr "Bakke 4"
 
 #: src/main/print-pcl.c:234
 msgid "Portable Sheet Feeder"
-msgstr "Alternativ arkføder"
+msgstr "Alternativ arkføder"
 
 #: src/main/print-pcl.c:235
 msgid "Desktop Sheet Feeder"
-msgstr "Intern arkføder"
+msgstr "Intern arkføder"
 
 #: src/main/print-pcl.c:236
 msgid "Tray"
@@ -1830,7 +1861,7 @@ msgstr "Valgfri kilde"
 
 #: src/main/print-pcl.c:239
 msgid "Autoselect"
-msgstr "Autoudvælg"
+msgstr "Autoudvælg"
 
 #: src/main/print-pcl.c:256
 msgid "600x600 DPI monochrome"
@@ -1863,16 +1894,15 @@ msgstr "PPD fil"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
-msgstr "Billedets størrelse skal passe til papirets størrelse"
+msgstr "Billedets størrelse skal passe til papirets størrelse"
 
 #: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
-msgstr "To-niveau gråskala"
+msgstr "To-niveau gråskala"
 
 #: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
 msgid "Three Level Grayscale"
-msgstr "To-niveau gråskala"
+msgstr "Tre-niveau gråskala"
 
 #: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
 #: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
@@ -1880,7 +1910,7 @@ msgstr "To-niveau gråskala"
 #: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
 #: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
-msgstr "FireTone grå"
+msgstr "FireTone grå"
 
 #: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
@@ -1896,9 +1926,8 @@ msgid "Seven Color Enhanced"
 msgstr "Syv farver forbedret"
 
 #: src/main/escp2-channels.c:1535
-#, fuzzy
 msgid "Eight Color Photo"
-msgstr "Seks farver foto"
+msgstr "Otte farver foto"
 
 #: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
@@ -1957,9 +1986,8 @@ msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
 #: src/main/escp2-channels.c:2042
-#, fuzzy
 msgid "Eight Color Raw"
-msgstr "Seks farver ufiltreret"
+msgstr "Otte farver ufiltreret"
 
 #: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
 #: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -1969,7 +1997,7 @@ msgstr "Seks farver ufiltreret"
 #: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
 #: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
-msgstr "Epson standard blæk"
+msgstr "Epson standard blæk"
 
 #: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 msgid "UltraChrome Photo Black"
@@ -1983,7 +2011,7 @@ msgstr "UltraChrome mat sort"
 #: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
 #: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Plain Paper Fast Load"
-msgstr "Almindeligt papir hurtigindføring"
+msgstr "Almindeligt papir hurtigindføring"
 
 #: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
 #: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
@@ -2024,19 +2052,19 @@ msgstr "Arkivfast mat papir"
 #: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
 #: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
-msgstr "Vandfarvepapir - strålende hvidt"
+msgstr "Vandfarvepapir - strålende hvidt"
 
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
-msgstr "360 x 90 DPI hurtig økonomisk"
+msgstr "360 x 90 DPI hurtig økonomisk"
 
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 DPI økonomisk"
+msgstr "360 x 120 DPI økonomisk"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
-msgstr "180 DPI økonomisk"
+msgstr "180 DPI økonomisk"
 
 #: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
 msgid "360 x 180 DPI Draft"
@@ -2048,7 +2076,7 @@ msgstr "360 x 240 DPI kladde"
 
 #: src/main/escp2-resolutions.c:68
 msgid "360 DPI High Quality"
-msgstr "360 DPI høj kvalitet"
+msgstr "360 DPI høj kvalitet"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
@@ -2065,16 +2093,15 @@ msgstr "720 DPI"
 
 #: src/main/escp2-resolutions.c:94
 msgid "720 DPI High Quality"
-msgstr "720 DPI høj kvalitet"
+msgstr "720 DPI høj kvalitet"
 
 #: src/main/escp2-resolutions.c:97
 msgid "720 DPI Highest Quality"
-msgstr "720 DPI højeste kvalitet"
+msgstr "720 DPI højeste kvalitet"
 
 #: src/main/escp2-resolutions.c:100
-#, fuzzy
 msgid "720 x 720 DPI"
-msgstr "720x720 DPI"
+msgstr "720 x 720 DPI"
 
 #: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
 #: src/main/escp2-resolutions.c:119
@@ -2083,12 +2110,11 @@ msgstr "1440 x 720 DPI"
 
 #: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 720 DPI højeste kvalitet"
+msgstr "1440 x 720 DPI højeste kvalitet"
 
 #: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgstr "1440 x 720 DPI vendt om"
 
 #: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 msgid "2880 x 720 DPI"
@@ -2096,67 +2122,90 @@ msgstr "2880 x 720 DPI"
 
 #: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "2880 x 720 DPI højeste kvalitet"
+msgstr "2880 x 720 DPI højeste kvalitet"
 
 #: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
 #: src/main/escp2-resolutions.c:139
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI højeste kvalitet"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 720 DPI højeste kvalitet"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
-#, fuzzy
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI"
+msgstr "2880 x 1440 DPI vendt om"
+
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:167
 #, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "2880 x 720 DPI højeste kvalitet"
+
+#: src/main/escp2-resolutions.c:171
 msgid "5760 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
-#, fuzzy
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 msgid "5760 x 2880 DPI"
-msgstr "2880 x 2880 DPI"
+msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
-msgstr "Tændt"
+msgstr "Tændt"
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 msgid "Interleave"
-msgstr "Udjævning"
+msgstr "Udjævning"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
-msgstr "Fire gennemløb"
+msgstr "Fire gennemløb"
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 msgid "Interleave 2"
-msgstr "Udjævning 2"
+msgstr "Udjævning 2"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 msgid "Eight Pass"
-msgstr "Otte gennemløb"
+msgstr "Otte gennemløb"
 
 #: src/main/generic-options.c:46
 msgid "Text"
@@ -2180,7 +2229,7 @@ msgstr "Linie-kunst"
 
 #: src/main/generic-options.c:55
 msgid "Page"
-msgstr "Side størrelse"
+msgstr "Side størrelse"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2200,7 +2249,7 @@ msgstr "Job type"
 
 #: src/main/generic-options.c:75
 msgid "Job vs. page mode"
-msgstr "Jobindstilling i modsætning til sideindstilling"
+msgstr "Jobindstilling i modsætning til sideindstilling"
 
 #: src/main/generic-options.c:80
 msgid "Page Number"
@@ -2235,8 +2284,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
-msgstr "Epson 4x6 fotopapir"
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr "Epson 4x6 fotopapir (riv-af kanter)"
 
 #: src/main/xmli18n-tmp.h:11
 msgid "5x7"
@@ -2715,1386 +2764,3050 @@ msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Egendefineret"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:144
 msgid "PostScript Level 1"
 msgstr "Postscript Level 1"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 2"
 msgstr "Postscript Level 2"
 
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr "Canon BJC 30"
-
-#: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
-msgstr "Canon BJC 50"
-
-#: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
-msgstr "Canon BJC 55"
-
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
-msgstr "Canon BJC 80"
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
-msgstr "Canon BJC 85"
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
-msgstr "Canon BJC 210"
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
-msgstr "Canon BJC 240"
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
-msgstr "Canon BJC 250"
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
-msgstr "Canon BJC 1000"
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
-msgstr "Canon BJC 2000"
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
-msgstr "Canon BJC 3000"
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
-msgstr "Canon BJC 4300"
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
-msgstr "Canon BJC 4400 foto"
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
-msgstr "Canon BJC 6000"
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
-msgstr "Canon BJC 6100"
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
-msgstr "Canon BJC 6200"
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
-msgstr "Canon BJC 6500"
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
-msgstr "Canon BJC 7000"
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
-msgstr "Canon BJC 7100"
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
-msgstr "Canon BJC 8200"
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:163
-#, fuzzy
-msgid "Canon S200"
-msgstr "Canon S400"
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
-msgstr "Canon S400"
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
-msgstr "Canon S450"
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
-msgstr "Canon S800"
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
-msgstr "Canon S4500"
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
-msgstr "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20UX"
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+msgid "Canon S100"
+msgstr "Canon S100"
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+msgid "Canon S200"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S300"
+msgstr "Canon S300"
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41UX"
+msgid "Canon S500"
+msgstr "Canon S500"
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+msgid "Canon S600"
+msgstr "Canon S600"
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+msgid "Canon S630"
+msgstr "Canon S630"
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42UX"
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+msgid "Canon iP4000"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:181
-#, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43UX"
+msgid "Epson Stylus C20"
+msgstr "Epson Stylus C20"
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+msgid "Epson Stylus C20SX"
+msgstr "Epson Stylus C20SX"
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+msgid "Epson Stylus C20UX"
+msgstr "Epson Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:184
-#, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44UX"
+msgid "Epson Stylus C40"
+msgstr "Epson Stylus C40"
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
+msgstr "Epson Stylus C40SX"
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
+msgstr "Epson Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C45"
-msgstr "EPSON Stylus C45"
+msgid "Epson Stylus C41"
+msgstr "Epson Stylus C41"
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C46"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus C41SX"
+msgstr "Epson Stylus C41SX"
 
 #: src/main/xmli18n-tmp.h:189
-#, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "EPSON Stylus C45"
+msgid "Epson Stylus C41UX"
+msgstr "Epson Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C50"
-msgstr "EPSON Stylus C50"
+msgid "Epson Stylus C42"
+msgstr "Epson Stylus C42"
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C60"
-msgstr "EPSON Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Epson Stylus C42SX"
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C61"
-msgstr "EPSON Stylus C61"
+msgid "Epson Stylus C42UX"
+msgstr "Epson Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C62"
-msgstr "EPSON Stylus C62"
+msgid "Epson Stylus C43"
+msgstr "Epson Stylus C43"
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C63"
-msgstr "EPSON Stylus C63"
+msgid "Epson Stylus C43SX"
+msgstr "Epson Stylus C43SX"
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C64"
-msgstr "EPSON Stylus C64"
+msgid "Epson Stylus C43UX"
+msgstr "Epson Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C65"
-msgstr "EPSON Stylus C65"
+msgid "Epson Stylus C44"
+msgstr "Epson Stylus C44"
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus C66"
-msgstr "EPSON Stylus C66"
+msgid "Epson Stylus C44SX"
+msgstr "Epson Stylus C44SX"
 
 #: src/main/xmli18n-tmp.h:198
-#, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus C44UX"
+msgstr "Epson Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus C70"
-msgstr "EPSON Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Epson Stylus C45"
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus C80"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Epson Stylus C46"
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus C82"
-msgstr "EPSON Stylus C82"
+msgid "Epson Stylus C48"
+msgstr "Epson Stylus C48"
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus C83"
-msgstr "EPSON Stylus C83"
+msgid "Epson Stylus C50"
+msgstr "Epson Stylus C50"
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus C84"
-msgstr "EPSON Stylus C84"
+msgid "Epson Stylus C60"
+msgstr "Epson Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus C85"
-msgstr "EPSON Stylus C85"
+msgid "Epson Stylus C61"
+msgstr "Epson Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus C86"
-msgstr "EPSON Stylus C86"
+msgid "Epson Stylus C62"
+msgstr "Epson Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
-#, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Epson Stylus C63"
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color"
-msgstr "EPSON Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Epson Stylus C64"
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color Pro"
-msgstr "EPSON Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Epson Stylus C65"
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color Pro XL"
-msgstr "EPSON Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Epson Stylus C66"
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 400"
-msgstr "EPSON Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Epson Stylus C68"
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 440"
-msgstr "EPSON Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Epson Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 460"
-msgstr "EPSON Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Epson Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 480"
-msgstr "EPSON Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Epson Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 500"
-msgstr "EPSON Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Epson Stylus C83"
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 580"
-msgstr "EPSON Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Epson Stylus C84"
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 600"
-msgstr "EPSON Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Epson Stylus C85"
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 640"
-msgstr "EPSON Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Epson Stylus C86"
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 660"
-msgstr "EPSON Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Epson Stylus C88"
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 670"
-msgstr "EPSON Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Epson Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 680"
-msgstr "EPSON Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Epson Stylus Color I"
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 740"
-msgstr "EPSON Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Epson Stylus Color II"
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 760"
-msgstr "EPSON Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Epson Stylus Color IIs"
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 777"
-msgstr "EPSON Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Epson Stylus Color PRO"
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 800"
-msgstr "EPSON Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Epson Stylus Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Color 850"
-msgstr "EPSON Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Epson Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Color 860"
-msgstr "EPSON Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Epson Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Color 880"
-msgstr "EPSON Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Epson Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Color 83"
-msgstr "EPSON Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Epson Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Color 900"
-msgstr "EPSON Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Epson Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Color 980"
-msgstr "EPSON Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Epson Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Color 1160"
-msgstr "EPSON Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Epson Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Color 1500"
-msgstr "EPSON Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Epson Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Color 1520"
-msgstr "EPSON Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Epson Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Color 3000"
-msgstr "EPSON Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Epson Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo"
-msgstr "EPSON Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Epson Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 700"
-msgstr "EPSON Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Epson Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo EX"
-msgstr "EPSON Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Epson Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+msgid "Epson Stylus Color 777"
+msgstr "Epson Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 720"
-msgstr "EPSON Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Epson Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 750"
-msgstr "EPSON Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Epson Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 780"
-msgstr "EPSON Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Epson Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "EPSON Stylus Photo 785EPX"
+msgid "Epson Stylus Color 880"
+msgstr "Epson Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 790"
-msgstr "EPSON Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Epson Stylus Color 8 3"
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 810"
-msgstr "EPSON Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Epson Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 820"
-msgstr "EPSON Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Epson Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+msgid "Epson Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 830"
-msgstr "EPSON Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 870"
-msgstr "EPSON Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 875"
-msgstr "EPSON Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 890"
-msgstr "EPSON Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Epson Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 895"
-msgstr "EPSON Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 900"
-msgstr "EPSON Stylus Photo 900"
+msgid "Epson Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 915"
-msgstr "EPSON Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 925"
-msgstr "EPSON Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+msgid "Epson Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo 950"
-msgstr "EPSON Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo 960"
-msgstr "EPSON Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo 1200"
-msgstr "EPSON Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo 1270"
-msgstr "EPSON Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo 1280"
-msgstr "EPSON Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo 1290"
-msgstr "EPSON Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo 2000P"
-msgstr "EPSON Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo 2100"
-msgstr "EPSON Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
+msgstr "Epson Stylus Photo 830U"
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo 2200"
-msgstr "EPSON Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo R210"
-msgstr "EPSON Stylus Photo R210"
+msgid "Epson Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
-#, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "EPSON Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R310"
-msgstr "EPSON Stylus Photo R310"
+msgid "Epson Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
-#, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
-#, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX400"
+msgid "Epson Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Photo RX420"
-msgstr "EPSON Stylus Photo RX420"
+msgid "Epson Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Photo RX425"
-msgstr "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Photo RX430"
-msgstr "EPSON Stylus Photo RX430"
+msgid "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX510"
+msgid "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX620"
+msgid "Epson Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX630"
+msgid "Epson Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
-#, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX400"
+msgid "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+msgid "Epson Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R1800"
+msgid "Epson Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
 
 #: src/main/xmli18n-tmp.h:284
-#, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus Pro 5000"
-msgstr "EPSON Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus Pro 5500"
-msgstr "EPSON Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus Pro 7000"
-msgstr "EPSON Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus Pro 7500"
-msgstr "EPSON Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus Pro 7600"
-msgstr "EPSON Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus Pro 9000"
-msgstr "EPSON Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus Pro 9500"
-msgstr "EPSON Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus Pro 9600"
-msgstr "EPSON Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus Pro 10000"
-msgstr "EPSON Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus Scan 2000"
-msgstr "EPSON Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus Scan 2500"
-msgstr "EPSON Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX1500"
-msgstr "EPSON Stylus CX1500"
+msgid "Epson Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX3100"
-msgstr "EPSON Stylus CX3100"
+msgid "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON Stylus CX3200"
-msgstr "EPSON Stylus CX3200"
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON Stylus CX3500"
-msgstr "EPSON Stylus CX3500"
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON Stylus CX3600"
-msgstr "EPSON Stylus CX3600"
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON Stylus CX3650"
-msgstr "EPSON Stylus CX3650"
+msgid "Epson Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
-#, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX8300"
+msgid "Epson Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
-#, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
-#, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "EPSON Stylus C85"
+msgid "Epson Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
-#, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "EPSON Stylus CX3100"
+msgid "Epson Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
-#, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
-#, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
-#, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX4600"
-msgstr "EPSON Stylus CX4600"
+msgid "Epson Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
-#, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
-#, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5100"
-msgstr "EPSON Stylus CX5100"
+msgid "Epson Stylus CX1500"
+msgstr "Epson Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5200"
-msgstr "EPSON Stylus CX5200"
+msgid "Epson Stylus CX3100"
+msgstr "Epson Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX5300"
-msgstr "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
+msgstr "Epson Stylus CX3200"
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX5400"
-msgstr "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
+msgstr "Epson Stylus CX3500"
 
 #: src/main/xmli18n-tmp.h:316
-#, fuzzy
-msgid "EPSON Stylus CX5700"
-msgstr "EPSON Stylus CX6500"
+msgid "Epson Stylus CX3600"
+msgstr "Epson Stylus CX3600"
 
 #: src/main/xmli18n-tmp.h:317
-#, fuzzy
-msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus CX3650"
+msgstr "Epson Stylus CX3650"
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX6300"
-msgstr "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
+msgstr "Epson Stylus CX3700"
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX6400"
-msgstr "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
+msgstr "Epson Stylus CX3800"
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX6500"
-msgstr "EPSON Stylus CX6500"
+msgid "Epson Stylus CX3805"
+msgstr "Epson Stylus CX3805"
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX6600"
-msgstr "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
+msgstr "Epson Stylus CX3810"
 
 #: src/main/xmli18n-tmp.h:322
-#, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "EPSON Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4100"
 
 #: src/main/xmli18n-tmp.h:323
-#, fuzzy
-msgid "EPSON Stylus CX7800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4200"
+msgstr "Epson Stylus CX4200"
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus CX8300"
-msgstr "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
+msgstr "Epson Stylus CX4500"
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus CX8400"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
+msgstr "Epson Stylus CX4600"
 
 #: src/main/xmli18n-tmp.h:326
-#, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus CX4700"
+msgstr "Epson Stylus CX4700"
 
 #: src/main/xmli18n-tmp.h:327
-#, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Epson Stylus CX4800"
 
 #: src/main/xmli18n-tmp.h:328
-#, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "EPSON Stylus CX3100"
+msgid "Epson Stylus CX5100"
+msgstr "Epson Stylus CX5100"
 
 #: src/main/xmli18n-tmp.h:329
-#, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "EPSON Stylus CX3500"
+msgid "Epson Stylus CX5200"
+msgstr "Epson Stylus CX5200"
 
 #: src/main/xmli18n-tmp.h:330
-#, fuzzy
-msgid "EPSON Stylus DX4200"
-msgstr "EPSON Stylus CX3200"
+msgid "Epson Stylus CX5300"
+msgstr "Epson Stylus CX5300"
 
 #: src/main/xmli18n-tmp.h:331
-#, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "EPSON Stylus C50"
+msgid "Epson Stylus CX5400"
+msgstr "Epson Stylus CX5400"
 
 #: src/main/xmli18n-tmp.h:332
-#, fuzzy
-msgid "EPSON Stylus DX4800"
-msgstr "EPSON Stylus CX4600"
+msgid "Epson Stylus CX5700"
+msgstr "Epson Stylus CX5700"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+msgid "Epson Stylus CX5800"
+msgstr "Epson Stylus CX5800"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+msgid "Epson Stylus CX6300"
+msgstr "Epson Stylus CX6300"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr "EPSON CL-700"
+msgid "Epson Stylus CX6400"
+msgstr "Epson Stylus CX6400"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr "EPSON CL-750"
+msgid "Epson Stylus CX6500"
+msgstr "Epson Stylus CX6500"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr "EPSON CL-760"
+msgid "Epson Stylus CX6600"
+msgstr "Epson Stylus CX6600"
 
 #: src/main/xmli18n-tmp.h:338
-#, fuzzy
-msgid "EPSON E-100"
-msgstr "EPSON EM-900C"
+msgid "Epson Stylus CX7700"
+msgstr "Epson Stylus CX7700"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr "EPSON EM-900C"
+msgid "Epson Stylus CX7800"
+msgstr "Epson Stylus CX7800"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr "EPSON EM-930C"
+msgid "Epson Stylus CX8300"
+msgstr "Epson Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr "EPSON MC-2000"
+msgid "Epson Stylus CX8400"
+msgstr "Epson Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr "EPSON MC-5000"
+msgid "Epson Stylus D68"
+msgstr "Epson Stylus D68"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr "EPSON MC-7000"
+msgid "Epson Stylus D88"
+msgstr "Epson Stylus D88"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr "EPSON MC-9000"
+msgid "Epson Stylus DX3800"
+msgstr "Epson Stylus DX3800"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr "EPSON MC-10000"
+msgid "Epson Stylus DX3850"
+msgstr "Epson Stylus DX3850"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr "EPSON MJ-930C"
+msgid "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4200"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr "EPSON MJ-5100C"
+msgid "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4250"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr "EPSON MJ-6000C"
+msgid "Epson Stylus DX4800"
+msgstr "Epson Stylus DX4800"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
-msgstr "EPSON MJ-8000C"
+msgid "Epson PictureMate"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
-msgstr "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
+msgstr "Epson PictureMate Deluxe"
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
-msgstr "EPSON PM-730C"
+msgid "Epson CL 700"
+msgstr "Epson CL 700"
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
-msgstr "EPSON PM-740C"
+msgid "Epson CL 750"
+msgstr "Epson CL 750"
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
-msgstr "EPSON PM-750C"
+msgid "Epson CL 760"
+msgstr "Epson CL 760"
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
-msgstr "EPSON PM-760C"
+msgid "Epson E 100"
+msgstr "Epson E 100"
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
-msgstr "EPSON PM-770C"
+msgid "Epson E 150"
+msgstr "Epson E 150"
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
-msgstr "EPSON PM-780C"
+msgid "Epson E 200"
+msgstr "Epson E 200"
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
-msgstr "EPSON PM-790PT"
+msgid "Epson EM 900C"
+msgstr "Epson EM 900C"
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
-msgstr "EPSON PM-800C"
+msgid "Epson EM 930C"
+msgstr "Epson EM 930C"
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
-msgstr "EPSON PM-850PT"
+msgid "Epson MC 2000"
+msgstr "Epson MC 2000"
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
-msgstr "EPSON PM-870C"
+msgid "Epson MC 5000"
+msgstr "Epson MC 5000"
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
-msgstr "EPSON PM-880C"
+msgid "Epson MC 7000"
+msgstr "Epson MC 7000"
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
-msgstr "EPSON PM-930C"
+msgid "Epson MC 9000"
+msgstr "Epson MC 9000"
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
-msgstr "EPSON PM-940C"
+msgid "Epson MC 10000"
+msgstr "Epson MC 10000"
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
-msgstr "EPSON PM-950C"
+msgid "Epson MJ 930C"
+msgstr "Epson MJ 930C"
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
-msgstr "EPSON PM-970C"
+msgid "Epson MJ 5100C"
+msgstr "Epson MJ 5100C"
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
-msgstr "EPSON PM-980C"
+msgid "Epson MJ 6000C"
+msgstr "Epson MJ 6000C"
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
-msgstr "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
+msgstr "Epson MJ 8000C"
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
-msgstr "EPSON PM-2200C"
+msgid "Epson PM 700C"
+msgstr "Epson PM 700C"
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
-msgstr "EPSON PM-3000C"
+msgid "Epson PM 730C"
+msgstr "Epson PM 730C"
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
-msgstr "EPSON PM-3300C"
+msgid "Epson PM 740C"
+msgstr "Epson PM 740C"
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
-msgstr "EPSON PM-3500C"
+msgid "Epson PM 750C"
+msgstr "Epson PM 750C"
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
-msgstr "EPSON PM-3700C"
+msgid "Epson PM 760C"
+msgstr "Epson PM 760C"
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
-msgstr "EPSON PM-4000PX"
+msgid "Epson PM 770C"
+msgstr "Epson PM 770C"
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
-msgstr "EPSON PM-5000C"
+msgid "Epson PM 780C"
+msgstr "Epson PM 780C"
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
-msgstr "EPSON PM-7000C"
+msgid "Epson PM 790PT"
+msgstr "Epson PM 790PT"
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
-msgstr "EPSON PM-9000C"
+msgid "Epson PM 800C"
+msgstr "Epson PM 800C"
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
-msgstr "EPSON PM-10000"
+msgid "Epson PM 850PT"
+msgstr "Epson PM 850PT"
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "EPSON PM-9000C"
+msgid "Epson PM 870C"
+msgstr "Epson PM 870C"
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PM-D750"
-msgstr "EPSON PM-D750"
+msgid "Epson PM 880C"
+msgstr "Epson PM 880C"
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PM-D770"
-msgstr "EPSON PM-D770"
+msgid "Epson PM 930C"
+msgstr "Epson PM 930C"
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PM-D1000"
-msgstr "EPSON PM-D1000"
+msgid "Epson PM 940C"
+msgstr "Epson PM 940C"
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PM-G700"
-msgstr "EPSON PM-G700"
+msgid "Epson PM 950C"
+msgstr "Epson PM 950C"
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PM-G720"
-msgstr "EPSON PM-G720"
+msgid "Epson PM 970C"
+msgstr "Epson PM 970C"
 
 #: src/main/xmli18n-tmp.h:384
-msgid "EPSON PM-G800"
-msgstr "EPSON PM-G800"
+msgid "Epson PM 980C"
+msgstr "Epson PM 980C"
 
 #: src/main/xmli18n-tmp.h:385
-msgid "EPSON PM-G820"
-msgstr "EPSON PM-G820"
+msgid "Epson PM 2000C"
+msgstr "Epson PM 2000C"
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "EPSON PX-V600"
+msgid "Epson PM 2200C"
+msgstr "Epson PM 2200C"
 
 #: src/main/xmli18n-tmp.h:387
-msgid "EPSON PX-G900"
-msgstr "EPSON PX-G900"
+msgid "Epson PM 3000C"
+msgstr "Epson PM 3000C"
 
 #: src/main/xmli18n-tmp.h:388
-msgid "EPSON PX-G920"
-msgstr "EPSON PX-G920"
+msgid "Epson PM 3300C"
+msgstr "Epson PM 3300C"
 
 #: src/main/xmli18n-tmp.h:389
-msgid "EPSON PX-G5000"
-msgstr "EPSON PX-G5000"
+msgid "Epson PM 3500C"
+msgstr "Epson PM 3500C"
 
 #: src/main/xmli18n-tmp.h:390
-msgid "EPSON PX-V500"
-msgstr "EPSON PX-V500"
+msgid "Epson PM 3700C"
+msgstr "Epson PM 3700C"
 
 #: src/main/xmli18n-tmp.h:391
-msgid "EPSON PX-V600"
-msgstr "EPSON PX-V600"
+msgid "Epson PM 4000PX"
+msgstr "Epson PM 4000PX"
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "EPSON PX-V500"
+msgid "Epson PM 5000C"
+msgstr "Epson PM 5000C"
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
-msgstr "EPSON PX-7000"
+msgid "Epson PM 7000C"
+msgstr "Epson PM 7000C"
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
-msgstr "EPSON PX-9000"
+msgid "Epson PM 9000C"
+msgstr "Epson PM 9000C"
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr "Apple Color StyleWriter 4100"
+msgid "Epson PM 10000"
+msgstr "Epson PM 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
-msgstr "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
+msgstr "Epson PM A650"
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
-msgstr "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
+msgstr "Epson PM A750"
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
-msgstr "HP DeskJet 340"
+msgid "Epson PM A890"
+msgstr "Epson PM A890"
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr "HP DeskJet 400"
+msgid "Epson PM A900"
+msgstr "Epson PM A900"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
-msgstr "HP DeskJet 500"
+msgid "Epson PM A950"
+msgstr "Epson PM A950"
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
-msgstr "HP DesignJet 230"
+msgid "Epson PM D600"
+msgstr "Epson PM D600"
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr "HP DesignJet 250C"
+msgid "Epson PM D750"
+msgstr "Epson PM D750"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr "HP DesignJet 700"
+msgid "Epson PM D770"
+msgstr "Epson PM D770"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
-msgstr "HP DesignJet 750C"
+msgid "Epson PM D800"
+msgstr "Epson PM D800"
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr "HP DesignJet 2500C"
+msgid "Epson PM D1000"
+msgstr "Epson PM D1000"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr "HP DesignJet 3500C"
+msgid "Epson PM G700"
+msgstr "Epson PM G700"
 
 #: src/main/xmli18n-tmp.h:407
+msgid "Epson PM G720"
+msgstr "Epson PM G720"
+
+#: src/main/xmli18n-tmp.h:408
+msgid "Epson PM G730"
+msgstr "Epson PM G730"
+
+#: src/main/xmli18n-tmp.h:409
+msgid "Epson PM G800"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:410
+msgid "Epson PM G820"
+msgstr "Epson PM G820"
+
+#: src/main/xmli18n-tmp.h:411
+msgid "Epson PX A650"
+msgstr "Epson PX A650"
+
+#: src/main/xmli18n-tmp.h:412
+msgid "Epson PX G900"
+msgstr "Epson PX G900"
+
+#: src/main/xmli18n-tmp.h:413
+msgid "Epson PX G920"
+msgstr "Epson PX G920"
+
+#: src/main/xmli18n-tmp.h:414
+msgid "Epson PX G5000"
+msgstr "Epson PX G5000"
+
+#: src/main/xmli18n-tmp.h:415
+msgid "Epson PX V500"
+msgstr "Epson PX V500"
+
+#: src/main/xmli18n-tmp.h:416
+msgid "Epson PX V600"
+msgstr "Epson PX V600"
+
+#: src/main/xmli18n-tmp.h:417
+msgid "Epson PX V630"
+msgstr "Epson PX V630"
+
+#: src/main/xmli18n-tmp.h:418
+msgid "Epson PX 5500"
+msgstr "Epson PX 5500"
+
+#: src/main/xmli18n-tmp.h:419
+msgid "Epson PX 7000"
+msgstr "Epson PX 7000"
+
+#: src/main/xmli18n-tmp.h:420
+msgid "Epson PX 9000"
+msgstr "Epson PX 9000"
+
+#: src/main/xmli18n-tmp.h:421
+msgid "Apollo P-2100"
+msgstr "Apollo P-2100"
+
+#: src/main/xmli18n-tmp.h:422
+msgid "Apollo P-2150"
+msgstr "Apollo P-2150"
+
+#: src/main/xmli18n-tmp.h:423
+msgid "Apollo P-2200"
+msgstr "Apollo P-2200"
+
+#: src/main/xmli18n-tmp.h:424
+msgid "Apollo P-2250"
+msgstr "Apollo P-2250"
+
+#: src/main/xmli18n-tmp.h:425
+msgid "Apollo P-2500"
+msgstr "Apollo P-2500"
+
+#: src/main/xmli18n-tmp.h:426
+msgid "Apollo P-2550"
+msgstr "Apollo P-2550"
+
+#: src/main/xmli18n-tmp.h:427
+msgid "Apollo P-2600"
+msgstr "Apollo P-2600"
+
+#: src/main/xmli18n-tmp.h:428
+msgid "Apollo P-2650"
+msgstr "Apollo P-2650"
+
+#: src/main/xmli18n-tmp.h:429
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/main/xmli18n-tmp.h:430
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/main/xmli18n-tmp.h:431
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/main/xmli18n-tmp.h:432
+msgid "Apple LaserWriter Select 360"
+msgstr "Apple LaserWriter Select 360"
+
+#: src/main/xmli18n-tmp.h:433
+msgid "Brother DCP-1200"
+msgstr "Brother DCP-1200"
+
+#: src/main/xmli18n-tmp.h:434
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/main/xmli18n-tmp.h:435
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/main/xmli18n-tmp.h:436
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/main/xmli18n-tmp.h:437
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Brother HL-1040"
+msgstr "Brother HL-1040"
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Brother HL-1050"
+msgstr "Brother HL-1050"
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Brother HL-1060"
+msgstr "Brother HL-1060"
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Brother HL-1070"
+msgstr "Brother HL-1070"
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Brother HL-1240"
+msgstr "Brother HL-1240"
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Brother HL-1250"
+msgstr "Brother HL-1250"
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Brother HL-1260"
+msgstr "Brother HL-1260"
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Brother HL-1270N"
+msgstr "Brother HL-1270N"
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Brother HL-1440"
+msgstr "Brother HL-1440"
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Brother HL-1660e"
+msgstr "Brother HL-1660e"
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Brother HL-2060"
+msgstr "Brother HL-2060"
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Brother MFC-6550MC"
+msgstr "Brother MFC-6550MC"
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Brother MFC-8300"
+msgstr "Brother MFC-8300"
+
+#: src/main/xmli18n-tmp.h:454
+msgid "Brother MFC-9500"
+msgstr "Brother MFC-9500"
+
+#: src/main/xmli18n-tmp.h:455
+msgid "Brother MFC-9600"
+msgstr "Brother MFC-9600"
+
+#: src/main/xmli18n-tmp.h:456
+msgid "Canon GP 335"
+msgstr "Canon GP 335"
+
+#: src/main/xmli18n-tmp.h:457
+msgid "Canon LBP-4sx"
+msgstr "Canon LBP-4sx"
+
+#: src/main/xmli18n-tmp.h:458
+msgid "Canon LBP-430"
+msgstr "Canon LBP-430"
+
+#: src/main/xmli18n-tmp.h:459
+msgid "Canon LBP-1000"
+msgstr "Canon LBP-1000"
+
+#: src/main/xmli18n-tmp.h:460
+msgid "Canon LBP-1260"
+msgstr "Canon LBP-1260"
+
+#: src/main/xmli18n-tmp.h:461
+msgid "Canon LBP-1760"
+msgstr "Canon LBP-1760"
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Canon imageRunner 330s"
+msgstr "Canon imageRunner 330s"
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Citizen ProJet II"
+msgstr "Citizen ProJet II"
+
+#: src/main/xmli18n-tmp.h:464
+msgid "DEC 1800"
+msgstr "DEC 1800"
+
+#: src/main/xmli18n-tmp.h:465
+msgid "DEC LN17"
+msgstr "DEC LN17"
+
+#: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr "Epson ActionLaser 1100"
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr "Epson ActionLaser II"
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr "Epson AcuLaser C2000"
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr "Epson AcuLaser C2000PS"
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr "Epson AcuLaser C8500"
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr "Epson AcuLaser C8500PS"
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr "Epson AcuLaser C8600"
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr "Epson AcuLaser C8600PS"
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr "Epson EPL-5200"
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr "Epson EPL-5200+"
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr "Epson EPL-5700"
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr "Epson EPL-5800"
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr "Epson EPL-5800PS"
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr "Epson EPL-5900"
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr "Epson EPL-5900PS"
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr "Epson EPL-6100"
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr "Epson EPL-6100PS"
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr "Epson EPL-7100"
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr "Fujitsu PrintPartner 10V"
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr "Fujitsu PrintPartner 16DV"
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr "Fujitsu PrintPartner 20W"
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr "Fujitsu PrintPartner 8000"
+
+#: src/main/xmli18n-tmp.h:489
+msgid "Generic PCL 4 Printer"
+msgstr "Generic PCL 4 Printer"
+
+#: src/main/xmli18n-tmp.h:490
+msgid "Generic PCL 5 Printer"
+msgstr "Generic PCL 5 Printer"
+
+#: src/main/xmli18n-tmp.h:491
+msgid "Generic PCL 5c Printer"
+msgstr "Generic PCL 5c Printer"
+
+#: src/main/xmli18n-tmp.h:492
+msgid "Generic PCL 5e Printer"
+msgstr "Generic PCL 5e Printer"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr "Generic PCL 6/PCL XL Printer"
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr "HP Business Inkjet 2200"
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr "HP Business Inkjet 2230"
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr "HP Business Inkjet 2250"
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr "HP Business Inkjet 2250TN"
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr "HP Business Inkjet 2280"
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr "HP Color Inkjet Printer CP1160"
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr "HP Color Inkjet Printer CP1700"
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr "HP Color LaserJet 2500"
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr "HP Color LaserJet 4500"
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr "HP Color LaserJet 4550"
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr "HP Color LaserJet 4600"
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr "HP Color LaserJet 5"
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr "HP Color LaserJet 5000"
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr "HP Color LaserJet 5500"
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP Color LaserJet 8550GN"
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:511
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:512
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:513
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:514
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C Plus"
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500CP"
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500CP"
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet ColorPro CAD"
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 420C"
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 450"
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:525
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 505J Plus"
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 510"
+
+#: src/main/xmli18n-tmp.h:528
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:529
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:530
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 5550"
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 5551"
+
+#: src/main/xmli18n-tmp.h:533
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr "HP DeskJet 600/600C"
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
-msgstr "HP DeskJet 600 series"
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr "HP DeskJet 690 series"
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 610CL"
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 6122"
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 6127"
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 612C"
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 640C"
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 648C"
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 660C"
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 670C"
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 670TV"
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 672C"
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 680C"
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 682C"
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 690C"
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 692C"
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 693C"
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 694C"
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 695C"
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 697C"
+
+#: src/main/xmli18n-tmp.h:555
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:556
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 815C"
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 816C"
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 825C"
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 830C"
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 832C"
+
+#: src/main/xmli18n-tmp.h:562
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 841C"
+
+#: src/main/xmli18n-tmp.h:564
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 843C"
+
+#: src/main/xmli18n-tmp.h:566
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:567
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:568
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 880C"
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 882C"
+
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
-msgstr "HP DeskJet 900 series"
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 920C"
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 9300"
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 930C"
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 932C"
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 933C"
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 934C"
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 935C"
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 940C"
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 948C"
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 950C"
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 952C"
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 955C"
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 957C"
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 959C"
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 960C"
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 970C"
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 975C"
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 980C"
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 990C"
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 995C"
+
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1125C"
+
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
-msgstr "HP DeskJet 2000 series"
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
-msgstr "HP DeskJet 2500 series"
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
-msgstr "HP PhotoSmart P1000"
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
-msgstr "HP PhotoSmart P1100"
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
-msgstr "HP LaserJet II series"
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
-msgstr "HP LaserJet IIP series"
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
-msgstr "HP LaserJet III series"
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
-msgstr "HP LaserJet 4 series"
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 3822"
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 2"
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 2D"
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet 2P Plus"
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 2P"
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 3"
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 3D"
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 3P w/ PCL5"
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 3P w/PS"
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4 Plus"
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4"
+
+#: src/main/xmli18n-tmp.h:620
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
-msgstr "HP LaserJet 4V"
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4ML"
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4P"
+
+#: src/main/xmli18n-tmp.h:624
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
-msgstr "HP LaserJet 5 series"
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5"
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 5L"
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5M"
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5MP"
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5P"
+
+#: src/main/xmli18n-tmp.h:631
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
-msgstr "HP LaserJet 6 series"
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 6L"
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 6MP"
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 6P"
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 1010"
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 1015"
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 1100"
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 1100A"
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 1150"
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 1200"
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 1220"
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 1300"
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 2100"
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 2100M"
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 2200"
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 2300"
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 3200"
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 3200m"
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 3200se"
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 3310 MFP"
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 3320 MFP"
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 3320N MFP"
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 3330 MFP"
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4000"
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4050"
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4100"
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4200"
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4300"
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5000"
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5100"
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 8000"
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 8100"
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 8150"
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 9000"
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr "HP Mopier 240"
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr "HP Mopier 320"
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr "HP OfficeJet 300"
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr "HP OfficeJet 330"
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr "HP OfficeJet 350"
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr "HP OfficeJet 500"
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr "HP OfficeJet 520"
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr "HP OfficeJet 570"
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr "HP OfficeJet 580"
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr "HP OfficeJet 590"
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr "HP OfficeJet 600"
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr "HP OfficeJet 610"
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr "HP OfficeJet 625"
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr "HP OfficeJet 630"
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr "HP OfficeJet 635"
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr "HP OfficeJet 700"
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr "HP OfficeJet 710"
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr "HP OfficeJet 720"
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr "HP OfficeJet 725"
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr "HP OfficeJet 5105"
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr "HP OfficeJet 5110"
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr "HP OfficeJet 5110xi"
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr "HP OfficeJet 6105"
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr "HP OfficeJet 6110"
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr "HP OfficeJet 7110"
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr "HP OfficeJet 7130"
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr "HP OfficeJet 7140"
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr "HP OfficeJet D125"
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr "HP OfficeJet D135"
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr "HP OfficeJet D145"
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr "HP OfficeJet D155"
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr "HP OfficeJet G55"
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr "HP OfficeJet G85"
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr "HP OfficeJet G95"
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr "HP OfficeJet K60"
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr "HP OfficeJet K60xi"
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr "HP OfficeJet K80"
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr "HP OfficeJet K80xi"
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr "HP OfficeJet LX"
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP OfficeJet Pro 1150C"
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP OfficeJet Pro 1170C"
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr "HP OfficeJet Pro 1175C"
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr "HP OfficeJet R40"
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr "HP OfficeJet R45"
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr "HP OfficeJet R60"
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr "HP OfficeJet R65"
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr "HP OfficeJet R80"
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr "HP OfficeJet T45"
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr "HP OfficeJet T65"
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr "HP OfficeJet V40"
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr "HP OfficeJet V40xi"
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr "HP OfficeJet"
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr "HP PSC 370"
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr "HP PSC 380"
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr "HP PSC 500"
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr "HP PSC 750"
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr "HP PSC 950"
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr "HP PSC 950xi"
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr "HP PSC 2110"
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr "HP PSC 2150"
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr "HP PSC 2210"
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart 7150"
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart 7345"
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart 7350"
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart 7550"
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P100"
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P130"
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P230"
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1115"
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1215"
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1218"
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1315"
+
+#: src/main/xmli18n-tmp.h:742
+msgid "HP e-printer e20"
+msgstr "HP e-printer e20"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr "IBM 4019"
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr "IBM 4029 030 LaserPrinter 10"
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr "IBM 4312"
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr "IBM Infoprint 12"
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr "IBM Page Printer 3112"
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr "Kyocera F-1010"
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr "Kyocera FS-600 - KPDL-2"
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr "Kyocera FS-600"
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr "Kyocera FS-680"
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr "Kyocera FS-800"
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr "Kyocera FS-1000"
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr "Kyocera FS-1000+"
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr "Kyocera FS-1010"
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr "Kyocera FS-1050"
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr "Kyocera FS-1200"
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr "Kyocera FS-1600"
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr "Kyocera FS-1600+"
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr "Kyocera FS-1700"
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr "Kyocera FS-1700+"
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr "Kyocera FS-1750"
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr "Kyocera FS-1800"
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr "Kyocera FS-1800+"
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr "Kyocera FS-1900"
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr "Kyocera FS-3500"
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr "Kyocera FS-3600"
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr "Kyocera FS-3600+"
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr "Kyocera FS-3700"
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr "Kyocera FS-3700+"
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr "Kyocera FS-3750"
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr "Kyocera FS-3800"
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr "Kyocera FS-5800C"
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr "Kyocera FS-5900C"
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr "Kyocera FS-6500"
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr "Kyocera FS-6500+"
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr "Kyocera FS-6700"
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr "Kyocera FS-7000"
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr "Kyocera FS-7000+"
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr "Kyocera FS-8000C"
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr "Kyocera FS-9000"
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr "Kyocera FS-9100DN"
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr "Kyocera FS-9500DN"
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr "Kyocera KM-1530"
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr "Kyocera KM-1810"
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr "Kyocera KM-2030"
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr "Kyocera KM-2530"
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr "Kyocera KM-3530"
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr "Kyocera KM-4230"
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr "Kyocera KM-4530"
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr "Kyocera KM-5230"
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr "Kyocera KM-5530"
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr "Kyocera KM-6230"
+
+#: src/main/xmli18n-tmp.h:795
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr "Okidata OL400"
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr "Okidata OL400e"
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr "Okidata OL400ex"
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr "Okidata OL410e"
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr "Okidata OL600e"
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr "Okidata OL610e/S"
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr "Okidata OL800"
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr "Okidata OL810ex"
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr "Okidata Okipage 6e"
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr "Okidata Okipage 6ex"
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr "Okidata Okipage 8p"
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr "Okidata Okipage 10e"
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr "Okidata Okipage 10ex"
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr "Okidata Okipage 14ex"
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr "Okidata Super 6e"
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr "Star LS-04"
+
+#: src/main/xmli18n-tmp.h:852
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr "Tally MT908"
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:863
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:864
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:865
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:866
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
-msgstr "Olympus P10"
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
-msgstr "Olympus P200"
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
-msgstr "Olympus P300"
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
-msgstr "Olympus P400"
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
-msgstr "Olympus P440"
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
-msgstr "Canon CP100"
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
-msgstr "Canon CP220"
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:887
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:462
-#, fuzzy
+#: src/main/xmli18n-tmp.h:888
 msgid "Sony UP-DR150"
-msgstr "Sony UP-DP10"
+msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
-msgstr "Fujifilm Printpix CX-400"
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
-msgstr "Fujifilm Printpix CX-550"
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:891
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
@@ -4104,7 +5817,7 @@ msgstr "Tommer"
 
 #: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
-msgstr "Brug tommer som basisenhed ved målangivelse"
+msgstr "Brug tommer som basisenhed ved målangivelse"
 
 #: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
@@ -4112,7 +5825,7 @@ msgstr "cm"
 
 #: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Brug centimeter som basisenhed ved målangivelse"
+msgstr "Brug centimeter som basisenhed ved målangivelse"
 
 #: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Points"
@@ -4120,7 +5833,7 @@ msgstr "Punkter"
 
 #: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
+msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
 
 #: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
@@ -4128,7 +5841,7 @@ msgstr "mm"
 
 #: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Brug millimeter som basisenhed ved målangivelse"
+msgstr "Brug millimeter som basisenhed ved målangivelse"
 
 #: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
@@ -4136,7 +5849,7 @@ msgstr "Pica"
 
 #: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Brug picas (1/12\") som basisenhed ved målangivelse"
+msgstr "Brug picas (1/12\") som basisenhed ved målangivelse"
 
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
@@ -4144,7 +5857,7 @@ msgstr "Farveudskrift"
 
 #: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
-msgstr "Print gråtoner med sort blæk"
+msgstr "Print gråtoner med sort blæk"
 
 #: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
@@ -4178,7 +5891,7 @@ msgstr "Ret kurve..."
 
 #: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
-msgstr "Sæt som standard"
+msgstr "Sæt som standard"
 
 #: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
@@ -4196,7 +5909,7 @@ msgstr "O.k"
 #: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
 #: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
-msgstr "Annullér"
+msgstr "Annullér"
 
 #: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
@@ -4213,7 +5926,7 @@ msgid ""
 "Save Settings"
 msgstr ""
 "    Print og\n"
-"gem opsætning"
+"gem opsætning"
 
 #: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
@@ -4221,7 +5934,7 @@ msgid ""
 "Settings"
 msgstr ""
 "    Gem\n"
-"opsætning"
+"opsætning"
 
 #: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
@@ -4244,28 +5957,28 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-"Placer billedet på siden.\n"
-"Klik og træk med venstre musetaste for at placere billedet.\n"
-"Klik og træk med højre musetaste for at flytte billedet med større "
-"præcision. Hver enhed af bevægelse flytter billedet et punkt (1/72\").\n"
-"Klik og træk med midterste musetaste for at flytte billedet i enheder af "
-"billedets størrelse.\n"
-"Tryk på skift tasten når du klikker og trækker bevirker, at billedet kun "
+"Placer billedet på siden.\n"
+"Klik og træk med venstre musetaste for at placere billedet.\n"
+"Klik og træk med højre musetaste for at flytte billedet med større "
+"præcision. Hver enhed af bevægelse flytter billedet et punkt (1/72\").\n"
+"Klik og træk med midterste musetaste for at flytte billedet i enheder af "
+"billedets størrelse.\n"
+"Tryk på skift tasten når du klikker og trækker bevirker, at billedet kun "
 "flyttes i enten lodret eller vandret retning.\n"
-"Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
+"Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
 "billedet returnere til dets oprindelig position."
 
 #: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
-msgstr "Papirstørrelse"
+msgstr "Papirstørrelse"
 
 #: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
-msgstr "Vis alle papirstørrelser"
+msgstr "Vis alle papirstørrelser"
 
 #: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
-msgstr "Størrelser:"
+msgstr "Størrelser:"
 
 #: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
 #: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
@@ -4274,20 +5987,20 @@ msgstr "Bredde:"
 
 #: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
-msgstr "Bredden af det papir der skal udskrives på"
+msgstr "Bredden af det papir der skal udskrives på"
 
 #: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
 #: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
-msgstr "Højde:"
+msgstr "Højde:"
 
 #: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
-msgstr "Højden af det papir der skal udskrives på"
+msgstr "Højden af det papir der skal udskrives på"
 
 #: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
-msgstr "Automatisk papirstørrelse"
+msgstr "Automatisk papirstørrelse"
 
 #: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
@@ -4295,7 +6008,7 @@ msgstr "Antal kopier"
 
 #: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 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"
+msgstr "Vælg antal kopier; skal være mellem 1 og 100"
 
 #: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 msgid "Image Position"
@@ -4307,11 +6020,11 @@ msgstr "Auto"
 
 #: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
-msgstr "Portræt"
+msgstr "Portræt"
 
 #: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
-msgstr "Tværformat"
+msgstr "Tværformat"
 
 #: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
@@ -4319,14 +6032,14 @@ msgstr "Vendt op/ned"
 
 #: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
-msgstr "Tværformat vendt op/ned"
+msgstr "Tværformat vendt op/ned"
 
 #: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
+"Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
 "ned"
 
 #: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
@@ -4344,19 +6057,19 @@ msgstr "Afstand fra venstre side af arket til billedet"
 #: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
 #: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
-msgstr "Højre:"
+msgstr "Højre:"
 
 #: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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"
+msgstr "Afstand fra venstre papiretkant til højre side af billedet"
 
 #: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
-msgstr "Afstand fra højre papirkant til billedet"
+msgstr "Afstand fra højre papirkant til billedet"
 
 #: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
-msgstr "Øverst:"
+msgstr "Øverst:"
 
 #: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
@@ -4377,7 +6090,7 @@ msgstr "Afstand fra den nederste kant af arket til billedet"
 
 #: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
-msgstr "Centrér:"
+msgstr "Centrér:"
 
 #: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Horizontal"
@@ -4385,7 +6098,7 @@ msgstr "Vandret"
 
 #: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
-msgstr "Centrér billedet i vandret på papiret"
+msgstr "Centrér billedet i vandret på papiret"
 
 #: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
@@ -4393,7 +6106,7 @@ msgstr "Begge"
 
 #: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
-msgstr "Centrér billedet på papiret"
+msgstr "Centrér billedet på papiret"
 
 #: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Vertical"
@@ -4401,7 +6114,7 @@ msgstr "Lodret"
 
 #: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
-msgstr "Centrér billedet i lodret på papiret"
+msgstr "Centrér billedet i lodret på papiret"
 
 #: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
@@ -4409,11 +6122,11 @@ msgstr "Indstil printer"
 
 #: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 msgid "Printer Make:"
-msgstr "Printer mærke:"
+msgstr "Printer mærke:"
 
 #: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
-msgstr "Vælg dit printermærke"
+msgstr "Vælg dit printermærke"
 
 #: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
 #: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
@@ -4422,7 +6135,7 @@ msgstr "Printermodel:"
 
 #: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
-msgstr "Vælg din printermodel"
+msgstr "Vælg din printermodel"
 
 #: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
@@ -4439,23 +6152,23 @@ msgstr "Bladr igennem"
 
 #: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
-msgstr "Vælg korrekt PPD filnavn for printeren"
+msgstr "Vælg korrekt PPD filnavn for printeren"
 
 #: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
-"ønsker at printe til"
+"Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
+"ønsker at printe til"
 
 #: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 msgid "Printer Queue:"
-msgstr "Printerkø:"
+msgstr "Printerkø:"
 
 #: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
-msgstr "Angiv den korrekte kommando til printning på din printer. "
+msgstr "Angiv den korrekte kommando til printning på din printer. "
 
 #: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
@@ -4471,7 +6184,7 @@ msgstr "Udskriv til fil"
 
 #: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
-msgstr "Definér ny printer"
+msgstr "Definér ny printer"
 
 #: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
 #: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
@@ -4518,16 +6231,16 @@ msgstr ""
 "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
 "og resten af Gutenprint udviklings teamet.\n"
 "\n"
-"Besøg vores web site på: http://gimp-print.sourceforge.net.\n"
+"Besøg vores web site på: http://gimp-print.sourceforge.net.\n"
 "\n"
-"Dette program er fri software, du må redistribuere det og/eller ændre\n"
+"Dette program er fri software, du må redistribuere det og/eller ændre\n"
 "det, under betingelserne i GNU General Public License som publiceret af\n"
 "the Free Software Foundation; enten version 2 af licensen, eller\n"
-"(efter eget ønske) enhver senere version.\n"
+"(efter eget ønske) enhver senere version.\n"
 "\n"
-"Dette program er distribueret i det håb at det kan være nyttigt, men\n"
-"UDEN ENHVER FORM FOR GARANTI, endda uden den underforståede\n"
-"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÅL\n"
+"Dette program er distribueret i det håb at det kan være nyttigt, men\n"
+"UDEN ENHVER FORM FOR GARANTI, endda uden den underforståede\n"
+"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
 "Se GNU General Public License for yderligere detaljer.\n"
 "\n"
 "Du skulle have modtaget en kopi af GNU General Public License sammen\n"
@@ -4543,19 +6256,19 @@ msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
-"Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
+"Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
 "at udskrive til"
 
 #: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
-msgstr "Opsætning printer..."
+msgstr "Opsætning printer..."
 
 #: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
-"Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
+"Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
 "denne printer"
 
 #: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
@@ -4568,11 +6281,11 @@ msgid ""
 "settings that you wish to remember for future use."
 msgstr ""
 "Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
-"indstillinger, som du ønsker at huske til senere brug."
+"indstillinger, som du ønsker at huske til senere brug."
 
 #: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 msgid "Image Size"
-msgstr "Billedstørrelse"
+msgstr "Billedstørrelse"
 
 #: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
@@ -4580,18 +6293,18 @@ msgstr "Skalering:"
 
 #: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
-msgstr "Angiv skalering (størrelse) af billedet"
+msgstr "Angiv skalering (størrelse) af billedet"
 
 #: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
-msgstr "Skalér med:"
+msgstr "Skalér med:"
 
 #: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
+"Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
 "udskriftspunkter pr. tomme"
 
 #: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
@@ -4600,7 +6313,7 @@ msgstr "Procent"
 
 #: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
-msgstr "Skalér udskriften til arkstørrelsen"
+msgstr "Skalér udskriften til arkstørrelsen"
 
 #: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
@@ -4608,7 +6321,7 @@ msgstr "PPI"
 
 #: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
-msgstr "Skalér udskriften til antal punkter pr. tomme"
+msgstr "Skalér udskriften til antal punkter pr. tomme"
 
 #: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
@@ -4616,7 +6329,7 @@ msgstr "Angiv bredden af udskriften"
 
 #: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
-msgstr "Angiv højden på udskriften"
+msgstr "Angiv højden på udskriften"
 
 #: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
@@ -4624,11 +6337,11 @@ msgid ""
 "Image Size"
 msgstr ""
 "Brug original\n"
-"billedstørrelse"
+"billedstørrelse"
 
 #: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
-msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
+msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
 
 #: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
@@ -4636,7 +6349,7 @@ msgstr "Udskrifts-farvejustering"
 
 #: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
-msgstr "Sæt til standardværdier"
+msgstr "Sæt til standardværdier"
 
 #: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
@@ -4660,20 +6373,20 @@ msgstr "Udskriftstype:"
 
 #: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
-msgstr "Vælg den ønskede udskriftstype"
+msgstr "Vælg den ønskede udskriftstype"
 
 #: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
-msgstr "Justér udskrift..."
+msgstr "Justér udskrift..."
 
 #: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
+msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
 
 #: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 msgid "Size Units:"
-msgstr "Mål-enhed:"
+msgstr "MÃ¥l-enhed:"
 
 #: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
@@ -4685,7 +6398,7 @@ msgstr "Enheder:"
 
 #: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
-msgstr "Vælg basisenhed for målangivelse ved printning"
+msgstr "Vælg basisenhed for målangivelse ved printning"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
 #: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
@@ -4730,7 +6443,7 @@ msgstr "Kurvetype"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form"
+msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form"
 
 #: src/gutenprintui2/curve.c:139
 msgid "Minimum X"
@@ -4738,7 +6451,7 @@ msgstr "Minimum X"
 
 #: src/gutenprintui2/curve.c:140
 msgid "Minimum possible value for X"
-msgstr "Mindst mulige værdi for X"
+msgstr "Mindst mulige værdi for X"
 
 #: src/gutenprintui2/curve.c:149
 msgid "Maximum X"
@@ -4746,7 +6459,7 @@ msgstr "Maksimum X"
 
 #: src/gutenprintui2/curve.c:150
 msgid "Maximum possible X value"
-msgstr "Størst mulige værdi for X"
+msgstr "Størst mulige værdi for X"
 
 #: src/gutenprintui2/curve.c:159
 msgid "Minimum Y"
@@ -4754,7 +6467,7 @@ msgstr "Minimum Y"
 
 #: src/gutenprintui2/curve.c:160
 msgid "Minimum possible value for Y"
-msgstr "Mindst mulige værdi for Y"
+msgstr "Mindst mulige værdi for Y"
 
 #: src/gutenprintui2/curve.c:169
 msgid "Maximum Y"
@@ -4762,89 +6475,89 @@ msgstr "Maksimum Y"
 
 #: src/gutenprintui2/curve.c:170
 msgid "Maximum possible value for Y"
-msgstr "Størst mulige værdi for Y"
+msgstr "Størst mulige værdi for Y"
 
 #: src/gutenprintui2/gammacurve.c:418
 msgid "_Gamma value"
-msgstr "_Gamma værdi"
+msgstr "_Gamma værdi"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 msgid "Printer Features"
 msgstr "Printer egenskaber"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr "Udskriftskontrol"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 msgid "Common"
 msgstr "Almindelig"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr "Ekstra 5"
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Danish"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil kommer UDEN NOGEN FORM FOR GARANTI; for detaljer skriv 'escputil -"
 "l'\n"
 "Dette er fri software, og du er velkommen til at redistribuere det\n"
-"under bestemte forudsætninger; skriv 'escputil -l' for detaljer.\n"
+"under bestemte forudsætninger; skriv 'escputil -l' for detaljer.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -4860,7 +6573,7 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "Dette program er fri software; du kan redistribuere det og/eller modificere "
 "det\n"
@@ -4869,19 +6582,20 @@ msgstr ""
 "valg)\n"
 "enhver senere version.\n"
 "\n"
-"Dette program er distribueret i det håb, at det vil være nyttigt, men\n"
-"UDEN ENHVER FOR FOR GARANTI, endda uden den underforståede\n"
-"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÅL\n"
+"Dette program er distribueret i det håb, at det vil være nyttigt, men\n"
+"UDEN ENHVER FOR FOR GARANTI, endda uden den underforståede\n"
+"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
 "Se GNU General Public License for yderligere detaljer.\n"
 "\n"
 "Du skulle have modtaget en kopi af GNU General Public License sammen\n"
 "med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -4919,52 +6633,62 @@ msgid ""
 "    -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 ""
-"Brug: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
+"Brug: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
-"Udfør vedligeholdelse på EPSON Stylus (R) printere.\n"
-"Eksempler: escputil --clean-head --printer stpex-på-tredie-etage\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"                [-C valg] [-p mønstre]\n"
+"Udfører vedligeholdelse på EPSON Stylus (R) printere.\n"
+"Eksempler: escputil --clean-head --new --printer-navn på min-kø\n"
+"          escputil --ink-level --raw-device /dev/usb/lp0\n"
 "\n"
 "  Kommandoer:\n"
 "    -c|--clean-head    Renser print hoved.\n"
-"    -n|--nozzle-check  Printer en dyse test.\n"
+"    -n|--nozzle-check  Printer et dyse-test mønster.\n"
 "                       Beskidte eller stoppede dyser viser sig som huller i\n"
-"                       mønsteret. Hvis der er huller, bør du rense\n"
+"                       mønsteret. Hvis der er huller, bør du rense\n"
 "                       print hovedet.\n"
-"    -a|--align-head    Retter printhovedet ind.    FORSIGTIG     unødig "
+"    -a|--align-head    Retter printhovedet ind.    FORSIGTIG     forkert "
 "brug\n"
-"                       af denne funktion kan resultere i dårlig "
-"printkvalitet, eller\n"
-"                       forårsage direkte skade på printeren.\n"
+"                       af denne funktion kan resultere i dårlig "
+"printkvalitet, og/eller\n"
+"                       forårsage direkte skade på printeren.\n"
 "    -s|--status        Viser printer status.\n"
-"    -i|--ink-level     Henter blæk niveau fra printeren. Dette kræver\n"
-"                       direkte læse/skrive adgang til printeren.\n"
-"    -e|--extended-ink-info   Henter udvidet information om blæk niveau fra\n"
-"                        printeren. Dette kræver direkte læse/skrive adgang "
+"    -i|--ink-level     Henter blæk niveau fra printeren. Dette kræver\n"
+"                       direkte læse/skrive adgang til printeren.\n"
+"    -e|--extended-ink-info     Henter udvidet information om blæk niveau "
+"fra\n"
+"                        printeren. Dette kræver direkte læse/skrive adgang "
 "til printeren.\n"
-"    -d|--identify      Forespørger printer om fremstiller og model.Dette\n"
-"                       kræver direkte læse/skrive adgang til printeren.\n"
+"    -d|--identify      Forespørger printer om fremstiller og model.Dette\n"
+"                       kræver direkte læse/skrive adgang til printeren.\n"
 "    -l|--license       Viser licens/garanti bestemmelser for dette program.\n"
-"    -M|--list-models   Lister de tilgængelige printermodeller.\n"
-"    -h|--help          Printer denne hjælpe meddelelse.\n"
+"    -M|--list-models   Lister de tilgængelige printermodeller.\n"
+"    -h|--help          Printer denne hjælpe meddelelse.\n"
 "  Indstillinger:\n"
-"    -P|--printer-name  Specificer den valgte printerkø.\n"
+"    -P|--printer-name  Specificer den valgte printerkø.\n"
 "                       Uden angivelse = system printeren lp.\n"
-"    -r|--raw-device    Specificer navnet på den enhed der skrives til "
+"    -r|--raw-device    Specificer navnet på den enhed der skrives til "
 "direkte\n"
-"                       i stedet for at gå gennem en printerkø.\n"
+"                       i stedet for at gå gennem en printerkø.\n"
 "    -u|--new           Printeren er ny (Stylus Color 740 eller nyere).\n"
+"                       Bruges kun når der ikke anvendes direkte adgang.\n"
 "    -q|--quiet         Undertrykker banneret.\n"
 "    -S|--short-name    Printer kort-navn for printer med --identify.\n"
-"    -m|--model         Specificer den præcise printermodel til brug for\n"
+"    -m|--model         Specificer den præcise printermodel til brug for\n"
 "                       indretning af printhoved (alignment).\n"
+"    -C|--choices       Angiv antallet af mønstre, ved printerhoved retten "
+"ind.\n"
+"    -p|--patterns      Angiv antallet af sæt af mønstre, ved printerhoved "
+"retten ind.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -4999,115 +6723,130 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Brug: escputil [Indstillinger] [Kommandoer]Brug: escputil [-c | -n | -a | -i "
-"| -s | -d | -l | -M]\n"
+"Brug: escputil [Indstillinger] [Kommandoer]\n"
+"Brug: escputil [-c | -n | -a | -i -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
-"Udfør vedligeholdelse på EPSON Stylus (R) printere.\n"
-"Eksempler: escputil -c -P stpex-på-tredie-etage\n"
-"          escputil -i -u -r /dev/lp0\n"
+"                [-C valg] [-p mønstre]\n"
+"Udfør vedligeholdelse på EPSON Stylus (R) printere.\n"
+"Eksempler: escputil -c -u -P min-kø\n"
+"          escputil -i -r /dev/usb/lp0\n"
 "\n"
 "  Kommandoer:\n"
 "    -c Renser print hoved.\n"
 "    -n Printer en dyse test.\n"
 "          Beskidte eller stoppede dyser viser sig som huller i\n"
-"          mønsteret. Hvis der er huller, bør du rense\n"
+"          mønsteret. Hvis der er huller, bør du rense\n"
 "          print hovedet.\n"
-"    -a Retter printhovedet ind.    FORSIGTIG     unødig brug\n"
-"          af denne funktion kan resultere i dårlig printkvalitet, eller\n"
-"          forårsage direkte skade på printeren.\n"
+"    -a Retter printhovedet ind.    FORSIGTIG     forkert brug\n"
+"          af denne funktion kan resultere i dårlig printkvalitet, eller\n"
+"          forårsage direkte skade på printeren.\n"
 "    -s Viser printer status.\n"
-"    -i Henter blæk niveau fra printeren. Dette kræver\n"
-"          direkte læse/skrive adgang til printeren.\n"
-"    -e Hent udvidede blæk-informationer fra printeren.\n"
-"          Kun for R800 printeren, eller tilsvarende. Dette kræver\n"
-"          direkte læse/skrive adgang til printeren.\n"
-"    -d Forespørger printer om fremstiller og model.Dette\n"
-"          kræver direkte læse/skrive adgang til printeren.\n"
+"    -i Henter blæk niveau fra printeren. Dette kræver\n"
+"          direkte læse/skrive adgang til printeren.\n"
+"    -e Hent udvidede blæk-informationer fra printeren.\n"
+"          Kun for R800 printeren, eller tilsvarende. Dette kræver\n"
+"          direkte læse/skrive adgang til printeren.\n"
+"    -d Forespørger printer om fremstiller og model.Dette\n"
+"          kræver direkte læse/skrive adgang til printeren.\n"
 "    -l Viser licens/garanti bestemmelser for dette program.\n"
-"    -M Lister de tilgængelige printermodeller.\n"
-"    -h Printer denne hjælpe meddelelse.\n"
+"    -M Lister de tilgængelige printermodeller.\n"
+"    -h Printer denne hjælpe meddelelse.\n"
 "  Indstillinger:\n"
-"    -P Specificer den valgte printerkø.\n"
+"    -P Specificer den valgte printerkø.\n"
 "          Uden angivelse = system printeren lp.\n"
-"    -r Specificer navnet på den enhed der skrives til direkte\n"
-"         i stedet for at gå gennem en printerkø.\n"
+"    -r Specificer navnet på den enhed der skrives til direkte\n"
+"         i stedet for at gå gennem en printerkø.\n"
 "    -u Printeren er ny (Stylus Color 740 eller nyere).\n"
-"        Kun nødvendigthvis der bruges andet end en printer med\n"
-"        direkte læse/skrive adgang.\n"
+"        Kun nødvendigt hvis der bruges andet end en printer med\n"
+"        direkte læse/skrive adgang.\n"
 "    -q Undertrykker banneret.\n"
 "    -S Printer kort-navn for printer med -d.\n"
-"    -m Specificer den præcise printermodel til brug for\n"
+"    -m Specificer den præcise printermodel til brug for\n"
 "           indretning af printhoved (alignment).\n"
+"    -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:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan kun specificere en printer eller en ufiltreret enhed."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan kun specificere en printermodel."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Retten-ind valg skal mindst være 1."
+
+#: src/escputil/escputil.c:376
+#, 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
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Ukendt indstilling %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Brug: %s [Indstillinger] kommando\n"
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Tast `%s --help' for yderligere information.\n"
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Tast `%s -h' for yderligere information.\n"
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Kan ikke åbne enheden %s: %s\n"
+msgstr "Kan ikke åbne enheden %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, 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:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
-msgstr "Læsning fra printer overskred tidsgrænsen\n"
+msgstr "Læsning fra printer overskred tidsgrænsen\n"
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Kan ikke læse fra %s: %s\n"
+msgstr "Kan ikke læse fra %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan ikke åbne %s læse/skrive: %s\n"
+msgstr "Kan ikke åbne %s læse/skrive: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5116,17 +6855,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-"\n"
-"Der opstod en fejl (netværkstilstand)!\n"
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5137,83 +6866,225 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
-msgstr "blækniveauer"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
+msgstr "Status: Fejl\n"
 
-#: src/escputil/escputil.c:922
-msgid "status"
-msgstr "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Status: Selv-printning\n"
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
 #, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
+msgid "Status: Busy\n"
+msgstr "Status: Optaget\n"
+
+#: src/escputil/escputil.c:1020
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Status: Venter\n"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Status: Ledig\n"
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Status: Sat til pause\n"
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Status; Renser\n"
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Status: Fabriksindstillet\n"
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Status: Lukker ned\n"
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Status Ukendt (%d)\n"
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Fejl: Fatal fejl\n"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Fejl: Anden tilslutning valgt\n"
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Fejl: Låg åbent\n"
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Fejl: Papir problemer\n"
+
+#: src/escputil/escputil.c:1061
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Fejl: Blæk slut\n"
+
+#: src/escputil/escputil.c:1064
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Fejl: Papir slut\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Fejl: Dobbeltfødningsfejl\n"
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Fejl: Uoprettelig papirskærerfejl\n"
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Fejl: Genoprettelig papirskærerproblem\n"
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Fejl: CD-skuffe tom\n"
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Fejl: Kortlæsningsfejl\n"
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Fejl: Skuffelåg åben\n"
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Fejl: Ukendt (%d)\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Printer dyse selv-test\n"
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Blækniveauer:\n"
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
-msgstr "Blæk farve"
+msgstr "Blæk farve"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr "Advarsel: Sort blækniveau lavt\n"
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Advarsel: Ukendt (%d)\n"
+
+#: src/escputil/escputil.c:1302
 #, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Printeren understøtter ikke listning af blæk typer!\n"
+msgid "Job Name: "
+msgstr "Job-navn: "
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr "blækniveauer"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr "status"
+
+#: src/escputil/escputil.c:1339
+#, 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:1451
 #, 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"
+"Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: 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:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Dato"
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
+msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan ikke identificere printermodel.\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoveder...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n"
+msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5251,47 +7122,47 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"Læs disse instruktioner grundigt før du fortsætter.\n"
+"Læs disse instruktioner grundigt før du fortsætter.\n"
 "\n"
-"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
-"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
+"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
+"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
 "i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
 "ikke\n"
 "blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
-"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
+"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
 "regning og risiko.\n"
 "\n"
-"Denne funktion printer %d test mønstre. Hvert mønster ser ens ud.\n"
-"Mønstrene består af en serie af lodrette liniepar der overlapper.\n"
+"Denne funktion printer %d test mønstre. Hvert mønster ser ens ud.\n"
+"Mønstrene består af en serie af lodrette liniepar der overlapper.\n"
 "Under hvert liniepar er der et nummer mellem %d og %d.\n"
 "\n"
-"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
+"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
 "rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
-"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
-"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
+"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
+"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
 "par.\n"
-"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne\n"
-"er præcist formede og ikke 'løber ud' i papiret.\n"
-"Når du har valgt det flotteste par, og har noteret tallet under, lægges\n"
+"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne\n"
+"er præcist formede og ikke 'løber ud' i papiret.\n"
+"Når du har valgt det flotteste par, og har noteret tallet under, lægges\n"
 "papiret i printeren igen, inden tallet indtastes.\n"
 "\n"
-"Hvert mønster er identisk, men senere mønstre anvender en finere dot\n"
-"for en mere kritisk retten-ind. Du skal køre alle gennemløbene for at opnå\n"
-"en perfekt retten-ind af din printer. Når du har kørt alle gennemløbene, "
+"Hvert mønster er identisk, men senere mønstre anvender en finere dot\n"
+"for en mere kritisk retten-ind. Du skal køre alle gennemløbene for at opnå\n"
+"en perfekt retten-ind af din printer. Når du har kørt alle gennemløbene, "
 "bliver\n"
-"mønsteret printet igen. Nu skal det midterste af parrene (#%d ud af de %d)\n"
-"være det bedste.\n"
+"mønsteret printet igen. Nu skal det midterste af parrene (#%d ud af de %d)\n"
+"være det bedste.\n"
 "\n"
-"Når dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
-"gentage(r) processen, eller afbryde(q) uden at gemme. Når du afbryder,\n"
-"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
+"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
+"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
+"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
 "for\n"
 "printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
 "mens\n"
-"processen løber.\n"
+"processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5326,50 +7197,55 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Læs disse instruktioner grundigt før du fortsætter.\n"
+"Læs disse instruktioner grundigt før du fortsætter.\n"
 "\n"
-"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
-"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
+"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
+"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
 "i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
 "ikke\n"
 "blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
-"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
+"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
 "regning og risiko.\n"
 "\n"
-"Denne funktion printer et test mønster der består af en serie af\n"
+"Denne funktion printer et test mønster der består af en serie af\n"
 "lodrette liniepar der overlapper.\n"
 "Under hvert liniepar er der et nummer mellem %d og %d.\n"
 "\n"
-"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
+"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
 "rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
-"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
-"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
+"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
+"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
 "par.\n"
-"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne "
+"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne "
 "er\n"
-"præcist formede og ikke 'løber ud' i papiret.\n"
-"Når du har valgt det flotteste par, og har noteret tallet under, lægges "
+"præcist formede og ikke 'løber ud' i papiret.\n"
+"Når du har valgt det flotteste par, og har noteret tallet under, lægges "
 "papiret\n"
 "i printeren igen, inden tallet indtastes.\n"
 "\n"
-"Når du har kørt retten-ind mønsteret, bliver det printet igen. Nu skal det\n"
-"midterste af parrene (#%d ud af de %d) være det bedste.\n"
+"Når du har kørt retten-ind mønsteret, bliver det printet igen. Nu skal det\n"
+"midterste af parrene (#%d ud af de %d) være det bedste.\n"
 "\n"
-"Når dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
-"gentage(r) processen, eller afbryde(q) uden at gemme. Når du afbryder,\n"
-"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
+"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
+"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
+"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
 "for\n"
 "printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
 "mens\n"
-"processen løber.\n"
+"processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 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:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr "Afbryder\n"
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5385,43 +7261,43 @@ msgstr ""
 "  (s) gemme resultatet i printeren,\n"
 "  (q) afbryde uden at gemme noget, eller\n"
 "  (r) gentage hele processen forfra.\n"
-"Du vil så blive bedt om at bekræfte dit valg.\n"
-"Hvad vil du gøre (s, q, r)?\n"
+"Du vil så blive bedt om at bekræfte dit valg.\n"
+"Hvad vil du gøre (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n"
+msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 "O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
-"Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
+"Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
-msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
+msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gentager processen med at retten-ind.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5430,23 +7306,23 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Dette vil blivende ændre konfigurationen af din printer.\n"
+"Dette vil blivende ændre konfigurationen af din printer.\n"
 "ADVARSEL: denne procedure er ikke blevet godkendt af Seiko Epson,\n"
-"og det kan skade din printer. Fortsæt?\n"
-"Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
+"og det kan skade din printer. Fortsæt?\n"
+"Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
 "printer:\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Klar til at gemme indstillingerne..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "mislykkedes!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5455,27 +7331,27 @@ msgstr ""
 "Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
 "processen.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "lykkedes!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dine retten-ind indstillinger er blevet gemt i printeren.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen blev ikke genkendt.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "Afsluttende kommando blev ikke bekræftet.\n"
+msgstr "Afsluttende kommando blev ikke bekræftet.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5485,64 +7361,64 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Denne procedure går ud fra, at din printer er en Epson %s.\n"
-"Hvis dette ikke er din printermodel, tast ctrl-C nu, og vælg\n"
+"Denne procedure går ud fra, at din printer er en Epson %s.\n"
+"Hvis dette ikke er din printermodel, tast ctrl-C nu, og vælg\n"
 "din aktuelle printermodel.\n"
 "\n"
 "Placer et ark papir i printeren, og begynd retten-ind\n"
 "processen af print hovedet.\n"
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
-msgstr "Tryk på enter-tasten for at fortsætte > "
+msgstr "Tryk på enter-tasten for at fortsætte > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 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"
+"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:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
-msgstr "Gennemløb #%d"
+msgstr "Gennemløb #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Indsæt et nyt ark papir.\n"
+msgstr "Indsæt et nyt ark papir.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Antal uden for givet område!\n"
+msgstr "Antal uden for givet område!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jeg kan ikke tolke hvad du tastede!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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"
+msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Prøver at sætte retten-ind..."
+msgstr "Prøver at sætte retten-ind..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "lykkedes.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5550,13 +7426,13 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"Kontroller at retten-ind er korrekt. Efter retten-ind mønsteret er printet "
+"Kontroller at retten-ind er korrekt. Efter retten-ind mønsteret er printet "
 "igen,\n"
-"skal du sikre dig, at det bedste mønster for hver linie er mønster %d.\n"
-"Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
+"skal du sikre dig, at det bedste mønster for hver linie er mønster %d.\n"
+"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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Fejl i inddata\n"
@@ -5565,11 +7441,11 @@ msgstr "Fejl i inddata\n"
 msgid "Printing..."
 msgstr "Udskriver..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
-msgstr "<Billede>/Fil/Udskriv..."
+msgstr "<Image>/Fil/Udskriv..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5582,24 +7458,24 @@ msgid ""
 msgstr ""
 "ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n"
 "  matcher ikke PPD filen (%s). Hvis du har opgraderet din version af\n"
-"  Gutenprint for nyligt, skal du geninstallere alle printerkøer.\n"
+"  Gutenprint for nyligt, skal du geninstallere alle printerkøer.\n"
 "  Se i distributionsvejledningen eller brug ``foomatic-ppdfile''\n"
 "  kommandoen for anvisninger.\n"
 "ERROR: ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n"
 "  matcher ikke PPD filen (%s).\n"
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
-"ERROR: ijsgutenprint: Fejlagtigt farveområde: bps %d kanaler %d område %s\n"
+"ERROR: ijsgutenprint: Fejlagtigt farveområde: bps %d kanaler %d område %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "ERROR: ijsgutenprint: Ingen række buffer\n"
+msgstr "ERROR: ijsgutenprint: Ingen række buffer\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
@@ -5607,109 +7483,95 @@ msgstr ""
 "ERROR: ijsgutenprint: Kan ikke fortolke parameter %s=%s (forventer et "
 "nummer)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "ERROR: ijsgutenprint: Printer skal specificeres med -sDeviceModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "ERROR: ijsgutenprint: Printer %s er ikke en kendt model\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr "ijsgutenprint: ukendt DeviceModel %s\n"
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "ERROR: ijsgutenprint: kan ikke fortolke TopLeft %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke PaperSize %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke kurve %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s flyde %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s int %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s dimension %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s boolean %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "ERROR: ijsgutenprint: Forkert parameter %s %d\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "ERROR: ijsgutenprint: bad key code %d\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "ERROR: ijsgutenprint: image_init failed %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "ERROR: ijsgutenprint: Unknown printer %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 
-#~ msgid "Red and Blue Ink Usage"
-#~ msgstr "Brug af rødt og blåt blæk"
-
-#~ msgid "Amount of red and blue ink to use"
-#~ msgstr "Mængde af rødt og blåt blæk der skal bruges"
-
-#~ msgid "unknown"
-#~ msgstr "ukendt"
-
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan ikke identificere printeren!\n"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
diff --git a/po/de.gmo b/po/de.gmo
index 3e4e84f..e180087 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index a18eca9..512e2ee 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-09-05 21:20MET\n"
 "Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
 "Language-Team: deutsch <gnome-de@gnome.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Zurücksetzen"
@@ -78,12 +78,12 @@ msgstr ""
 msgid "Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -147,207 +147,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Folie"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Transferfolie"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Schreibmaschinenpapier"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Briefumschlag"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Spezialpapier"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt Transfers"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "High Gloss Film"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Glossy Foto Papier"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Glossy Foto Karten"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Foto Papier Pro"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -355,16 +355,16 @@ msgstr "Foto Papier Pro"
 msgid "Other"
 msgstr "Anderes"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Größe"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -381,57 +381,57 @@ msgstr "Größe"
 msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Größe des Papiers "
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Medium Quelle"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "in welchem Schacht ist das Druckmedium"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintentype"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -440,21 +440,21 @@ msgstr "Tintentype"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,14 +464,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Druckermodel:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -481,168 +481,169 @@ msgstr "Druckermodel:"
 msgid "Core Parameter"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "helles Magenta"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Auto-Einzug"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Handeinzug mit Pause"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Handeinzug ohne Pause"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Mattes Papier"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Schwarz"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Foto CcMmYK Farbe"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY Farbe"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Foto CcMmY Farbe"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK Farbe"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY Farbe"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY Farbe"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK Farbe"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Schwarz"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -844,14 +845,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -860,14 +862,15 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -876,14 +879,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -892,10 +896,10 @@ msgstr "Gelb"
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -914,10 +918,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1161,233 +1165,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ist kein erlaubter Parameter von %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Die Bildgröße stimmt nicht\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Schacht"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Foto Papier"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höhe:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Sieben Farb Foto"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mattes Papier"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Foto Papier"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Schwarz"
@@ -1575,138 +1606,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -1792,70 +1823,70 @@ msgstr "Sechs Farben Foto"
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1866,8 +1897,8 @@ msgstr "Ilford schweres Papier"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2282,62 +2313,88 @@ msgstr "1200 DPI höchste Qualität"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1200 DPI höchste Qualität"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1200 DPI höchste Qualität"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1200 DPI höchste Qualität"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1200 DPI höchste Qualität"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
@@ -2425,7 +2482,8 @@ msgid "4x6"
 msgstr "4×6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2912,1347 +2970,3081 @@ msgid "Wide Postcard"
 msgstr "Postkarte"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 #, fuzzy
 msgid "Custom"
 msgstr "Auto"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "EPSON Stylus C20"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C20SX"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C20UX"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "EPSON Stylus C40"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C40SX"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C40UX"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "EPSON Stylus C41"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C41SX"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C41UX"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "EPSON Stylus C42"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C42SX"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C42UX"
+msgid "Canon iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "EPSON Stylus C43"
+msgid "Epson Stylus C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C43SX"
+msgid "Epson Stylus C20SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C43UX"
+msgid "Epson Stylus C20UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C45"
+msgid "Epson Stylus C41"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C46"
+msgid "Epson Stylus C41SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "EPSON Stylus C48"
+msgid "Epson Stylus C41UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C50"
+msgid "Epson Stylus C42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C60"
+msgid "Epson Stylus C42SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C61"
+msgid "Epson Stylus C42UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C62"
+msgid "Epson Stylus C43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C63"
+msgid "Epson Stylus C43SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C64"
+msgid "Epson Stylus C43UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C65"
+msgid "Epson Stylus C44"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus C66"
+msgid "Epson Stylus C44SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:198
-msgid "EPSON Stylus C68"
+msgid "Epson Stylus C44UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus C70"
+msgid "Epson Stylus C45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus C80"
+msgid "Epson Stylus C46"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus C82"
+msgid "Epson Stylus C48"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus C83"
+msgid "Epson Stylus C50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus C84"
+msgid "Epson Stylus C60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:206
-msgid "EPSON Stylus C88"
+msgid "Epson Stylus C63"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color"
+msgid "Epson Stylus C64"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color Pro"
+msgid "Epson Stylus C65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color Pro XL"
+msgid "Epson Stylus C66"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 400"
+msgid "Epson Stylus C68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 440"
+msgid "Epson Stylus C70"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 460"
+msgid "Epson Stylus C80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 480"
+msgid "Epson Stylus C82"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 500"
+msgid "Epson Stylus C83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 580"
+msgid "Epson Stylus C84"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 600"
+msgid "Epson Stylus C85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 640"
+msgid "Epson Stylus C86"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 660"
+msgid "Epson Stylus C88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 670"
+msgid "Epson Stylus Color"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 680"
+msgid "Epson Stylus Color I"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 740"
+msgid "Epson Stylus Color II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 760"
+msgid "Epson Stylus Color IIs"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 777"
+msgid "Epson Stylus Color PRO"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 800"
+msgid "Epson Stylus Pro XL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Color 850"
+msgid "Epson Stylus Color 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Color 860"
+msgid "Epson Stylus Color 440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Color 880"
+msgid "Epson Stylus Color 460"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Color 83"
+msgid "Epson Stylus Color 480"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Color 900"
+msgid "Epson Stylus Color 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Color 980"
+msgid "Epson Stylus Color 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Color 1160"
+msgid "Epson Stylus Color 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Color 1500"
+msgid "Epson Stylus Color 640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Color 1520"
+msgid "Epson Stylus Color 660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Color 3000"
+msgid "Epson Stylus Color 670"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo"
+msgid "Epson Stylus Color 680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 700"
+msgid "Epson Stylus Color 740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo EX"
+msgid "Epson Stylus Color 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo EX3"
+msgid "Epson Stylus Color 777"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 720"
+msgid "Epson Stylus Color 800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 750"
+msgid "Epson Stylus Color 850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 780"
+msgid "Epson Stylus Color 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 785EPX"
+msgid "Epson Stylus Color 880"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 810"
+msgid "Epson Stylus Color 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 820"
+msgid "Epson Stylus Color 980"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 825"
+msgid "Epson Stylus Color 1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 890"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 895"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 700"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 900"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo EX"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 915"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 925"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 720"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo 935"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 750"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo 950"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 780"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo 960"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 785"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo 1200"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 790"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo 1270"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 810"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo 1280"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 820"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo 1290"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 825"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo 2000P"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 830"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo 2200"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 870"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo R200"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 875"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo R210"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 890"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:267
-msgid "EPSON Stylus Photo R220"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 895"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R300"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 900"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R310"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 915"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:270
-msgid "EPSON Stylus Photo R320"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 925"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:271
-msgid "EPSON Stylus Photo R340"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 935"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Photo RX400"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 950"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Photo RX420"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 960"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Photo RX430"
+msgid "Epson Stylus Photo 1270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo 1280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Photo RX510"
+msgid "Epson Stylus Photo 1290"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Photo RX600"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Photo RX620"
+msgid "Epson Stylus Photo 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Photo RX630"
+msgid "Epson Stylus Photo 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:281
-msgid "EPSON Stylus Photo RX700"
+msgid "Epson Stylus Photo R200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus Photo R800"
+msgid "Epson Stylus Photo R210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus Photo R1800"
+msgid "Epson Stylus Photo R220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:284
-msgid "EPSON Stylus Photo R2400"
+msgid "Epson Stylus Photo R300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX1500"
+msgid "Epson Stylus Photo RX630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX3100"
+msgid "Epson Stylus Photo RX700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON Stylus CX3200"
+msgid "Epson Stylus Photo R800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON Stylus CX3500"
+msgid "Epson Stylus Photo R1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON Stylus CX3600"
+msgid "Epson Stylus Photo R2400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON Stylus CX3650"
+msgid "Epson Stylus Pro 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:302
-msgid "EPSON Stylus CX3700"
+msgid "Epson Stylus Pro 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:303
-msgid "EPSON Stylus CX3800"
+msgid "Epson Stylus Pro 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON Stylus CX3805"
+msgid "Epson Stylus Pro 7500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON Stylus CX3810"
+msgid "Epson Stylus Pro 7600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON Stylus CX4100"
+msgid "Epson Stylus Pro 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON Stylus CX4200"
+msgid "Epson Stylus Pro 9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON Stylus CX4500"
+msgid "Epson Stylus Pro 9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX4600"
+msgid "Epson Stylus Pro 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON Stylus CX4700"
+msgid "Epson Stylus Scan 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON Stylus CX4800"
+msgid "Epson Stylus Scan 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5100"
+msgid "Epson Stylus CX1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5200"
+msgid "Epson Stylus CX3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX6500"
+msgid "Epson Stylus CX3805"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON Stylus CX7700"
+msgid "Epson Stylus CX4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON Stylus D68"
+msgid "Epson Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON Stylus D88"
+msgid "Epson Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON Stylus DX3800"
+msgid "Epson Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON Stylus DX3850"
+msgid "Epson Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON Stylus DX4250"
+msgid "Epson Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
+msgid "Epson Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
+msgid "Epson Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
+msgid "Epson Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
+msgid "Epson Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
+msgid "Epson Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON E-100"
+msgid "Epson Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
+msgid "Epson Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
+msgid "Epson Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
+msgid "Epson Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
+msgid "Epson Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
+msgid "Epson Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
+msgid "Epson Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
+msgid "Epson Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
+msgid "Epson Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
+msgid "Epson Stylus DX4250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
+msgid "Epson Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "EPSON PM-A900"
+msgid "Epson PM 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PM-D750"
+msgid "Epson PM 880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PM-D770"
+msgid "Epson PM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PM-D1000"
+msgid "Epson PM 940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PM-G700"
+msgid "Epson PM 950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PM-G720"
+msgid "Epson PM 970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "EPSON PM-G800"
+msgid "Epson PM 980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "EPSON PM-G820"
+msgid "Epson PM 2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "EPSON PX-A650"
+msgid "Epson PM 2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "EPSON PX-G900"
+msgid "Epson PM 3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "EPSON PX-G920"
+msgid "Epson PM 3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "EPSON PX-G5000"
+msgid "Epson PM 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "EPSON PX-V500"
+msgid "Epson PM 3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "EPSON PX-V600"
+msgid "Epson PM 4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "EPSON PX-5500"
+msgid "Epson PM 5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
+msgid "Epson PM 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
+msgid "Epson PM A900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
+msgid "Epson PM D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
+msgid "Epson PM D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
+msgid "Epson PM D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
+msgid "Epson PM G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
+msgid "Epson PM G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
+msgid "Epson PM G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
+msgid "Epson PM G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
+msgid "Epson PX A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
+msgid "Epson PX G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
+msgid "Epson PX G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
+msgid "Epson PX G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
+msgid "Epson PX V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
+msgid "Epson PX V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
+msgid "Epson PX 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Neuen Printer einrichten"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Neuen Printer einrichten"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Neuen Printer einrichten"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Neuen Printer einrichten"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Drucker Name:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Drucker einrichten"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4960,79 +6752,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Drucker Einstellungen"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Ausgabeart:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Befehl:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Schacht 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Schacht 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Schacht 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Schacht 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Probeausdruck"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "German"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil Version "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5044,9 +6836,10 @@ msgstr ""
 "Bedingungen, \n"
 "weitergeben; für Einzelheiten geben sie 'escputil -l' ein.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5079,11 +6872,12 @@ msgstr ""
 "    an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
 "    MA 02139, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5121,6 +6915,8 @@ msgid ""
 "    -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 ""
 "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
@@ -5163,12 +6959,13 @@ msgstr ""
 "    -q|--quiet         Unterdrücke die Programmausgaben.\n"
 "    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5203,6 +7000,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
@@ -5245,74 +7044,84 @@ msgstr ""
 "    -q|--quiet         Unterdrücke die Programmausgaben.\n"
 "    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, 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:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Unbekannte Option %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kann keine Befehle an den Drucker senden\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kann nicht von %s: %s lesen.\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kann %s nicht lesen/beschreiben: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kann nicht auf %s: %s schreiben.\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5321,15 +7130,7 @@ msgstr ""
 "\n"
 "Kann auf %s: %s nicht schreiben\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5340,83 +7141,225 @@ msgstr ""
 "Kann den Druckertype nicht feststellen.\n"
 "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
+msgid "Status: Waiting\n"
+msgstr "Farbbalance:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Eingabefehler\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Eingabefehler\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Farbtinte"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Drucker unterstützt keine Farbausgabe\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Reinige die Köpfe...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5492,7 +7435,7 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5565,12 +7508,17 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 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:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5589,13 +7537,13 @@ msgstr ""
 "Sie werden um eine Bestätigung gebeten.\n"
 "Was möchten sie tun  (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5603,7 +7551,7 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
 "sichern möchten\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5612,7 +7560,7 @@ msgstr ""
 "Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
 "Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5621,12 +7569,12 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
 "wiederholen möchten:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5641,17 +7589,17 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
 "Drucker sichern möchten.\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Wie man die Einstellungen sichert..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "gescheitert!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5660,27 +7608,27 @@ msgstr ""
 "Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
 "die Kopf-Ausrichtung wiederholen. \n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "erledigt!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5696,12 +7644,12 @@ msgstr ""
 "\n"
 "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Drücken sie Eingabe um fortzufahren > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5713,42 +7661,42 @@ msgstr ""
 "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Durchgang #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Bitte legen sie ein neues Blatt ein.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Die Zahl ist ungültig!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Wie bitte ?????\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Beginne die Köpfe einzurichten..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "erledigt. \n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5761,7 +7709,7 @@ msgstr ""
 "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Eingabefehler\n"
@@ -5770,11 +7718,11 @@ msgstr "Eingabefehler\n"
 msgid "Printing..."
 msgstr "Drucken..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Datei/Drucken..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5786,118 +7734,121 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "schlechter Farbraum:  bps %d Kanäle %d Abstand %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Kein Zeilen-Speicher\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Kann den Parameter %s=%s nicht auswerten (erwarte eine Zahl)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Der Drucker muß mit -sMODEL angegeben werden\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Druckermodel %s ist unbekannt.\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Zeilensprung gescheitert bei % 0f \n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "Zeilensprung gescheitert bei % 0f \n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init gescheitert %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Kann file descriptor : %s nicht öffnen\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Kann %s: %s nicht öffnen\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Unzulässige Parameter, breche ab!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "Zeilensprung gescheitert bei % 0f \n"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Drucker unterstützt keine Farbausgabe\n"
+
+#, fuzzy
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "Kann die Meldungen vom Drucker nicht deuten.\n"
 
diff --git a/po/el.gmo b/po/el.gmo
index 429ac50..e21d6ae 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 1b4c902..f8b2e30 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2001-12-29 20:10+0000\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -81,12 +81,12 @@ msgstr ""
 msgid "Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -139,152 +139,152 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
@@ -292,12 +292,12 @@ msgstr "2400x600 DPI"
 msgid "Plain Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
@@ -305,50 +305,50 @@ msgstr "Êýñéá Óåëßäá"
 msgid "Transparencies"
 msgstr "ÄéáöáíÝò"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 #, fuzzy
 msgid "Back Print Film"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 #, fuzzy
 msgid "Fabric Sheets"
 msgstr "Åêôýðùóç Öýëëùí"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 #, fuzzy
 msgid "Envelope"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
 #
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 #, fuzzy
 msgid "High Resolution Paper"
 msgstr "AíÜëõóç ×:"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 #, fuzzy
 msgid "T-Shirt Transfers"
 msgstr "ÌåôáöïñÜ Áñ÷åßùí"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr ""
 
 #
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -357,16 +357,16 @@ msgid "Other"
 msgstr "¶ëëá"
 
 #
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -383,59 +383,59 @@ msgstr "ÌÝãåèïò"
 msgid "Basic Printer Setup"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 #, fuzzy
 msgid "Media Type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 #, fuzzy
 msgid "Media Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -444,7 +444,7 @@ msgstr "Ôýðïò MIME"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
@@ -452,14 +452,14 @@ msgstr ""
 msgid "Type of ink in the printer"
 msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -469,14 +469,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -486,175 +486,176 @@ msgstr "¼íïìá åêôõðùôÞ:"
 msgid "Core Parameter"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "ìþâ"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 #, fuzzy
 msgid "Auto Sheet Feeder"
 msgstr "Áõôüìáôç áðüêñõøç"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 #, fuzzy
 msgid "Manual with Pause"
 msgstr "Óåëßäá åã÷åéñéäßïõ"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Ìáýñï"
+#: src/main/print-canon.c:2049
+#, fuzzy
+msgid "Photo CcMmYK Color"
+msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
-#: src/main/print-canon.c:2020
+#: src/main/print-canon.c:2052
 #, fuzzy
-msgid "CMY Color"
-msgstr "+ ×ñþìá"
+msgid "Photo CcMmY Color"
+msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 #, fuzzy
 msgid "CMYK Color"
 msgstr "+ ×ñþìá"
 
-#: src/main/print-canon.c:2026
+#: src/main/print-canon.c:2058
 #, fuzzy
-msgid "Photo CcMmY Color"
-msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
+msgid "CMY Color"
+msgstr "+ ×ñþìá"
 
-#: src/main/print-canon.c:2029
-#, fuzzy
-msgid "Photo CcMmYK Color"
-msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Ìáýñï"
 
 #
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -858,14 +859,15 @@ msgstr "ÃÜììá"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Êõáíü"
 
@@ -874,14 +876,15 @@ msgstr "Êõáíü"
 msgid "Adjust the cyan gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
@@ -891,14 +894,15 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
@@ -907,10 +911,10 @@ msgstr "Êßôñéíï"
 msgid "Adjust the yellow gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -929,10 +933,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1176,231 +1180,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Êáíïíéêü"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ñüëïò"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Åã÷åéñßäéï"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2-data.c:496
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Åã÷åéñßäéï"
+
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Åã÷åéñßäéï"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "ÄïêéìÞ"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Êåßìåíá"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¾øïò:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Êñõðôïãñáößá"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Ìáýñï"
@@ -1588,138 +1621,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1806,14 +1839,14 @@ msgstr ""
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
@@ -1821,7 +1854,7 @@ msgstr ""
 msgid "Envelopes"
 msgstr "ÐñïãñáììáôéóôÝò"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
@@ -1829,21 +1862,21 @@ msgstr "ÐñïãñáììáôéóôÝò"
 msgid "Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
@@ -1851,28 +1884,28 @@ msgstr ""
 msgid "Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1883,8 +1916,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2315,62 +2348,88 @@ msgstr ""
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Åñãáóßá"
@@ -2467,7 +2526,7 @@ msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
 #, fuzzy
-msgid "Epson 4x6 Photo Paper"
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Êåßìåíá"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2983,1528 +3042,3246 @@ msgstr ""
 msgid "Wide Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-# Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
 #: src/main/xmli18n-tmp.h:131
-msgid "Custom"
-msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
+msgid "Chilean Office"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:132
-msgid "89 mm Roll Paper"
+msgid "Chilean Double Letter"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:133
-msgid "4 Inch Roll Paper"
+msgid "Chilean Double Office"
 msgstr ""
 
+# Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
 #: src/main/xmli18n-tmp.h:134
-msgid "5 Inch Roll Paper"
-msgstr ""
+msgid "Custom"
+msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
 #: src/main/xmli18n-tmp.h:135
-msgid "210 mm Roll Paper"
+msgid "89 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:136
-msgid "13 Inch Roll Paper"
+msgid "4 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:137
-msgid "22 Inch Roll Paper"
+msgid "5 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:138
-msgid "24 Inch Roll Paper"
+msgid "210 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:139
-msgid "36 Inch Roll Paper"
+msgid "13 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:140
-msgid "44 Inch Roll Paper"
+msgid "22 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
+msgid "24 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
+msgid "36 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
+msgid "44 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Slashdot"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Slashdot"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Ñýèìéóç ÅêôõðùôÞ"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5218,82 +6995,82 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "ÅíôïëÞ:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Greek"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 #, fuzzy
 msgid "ISOLatin1"
 msgstr "ËÜôéí"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 #, fuzzy
 msgid "Escputil version "
 msgstr "%s Ýêäïóç %s"
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5303,9 +7080,9 @@ msgstr ""
 "ëïãéóìéêï, êáé ìðïñåßôå íá ôï áíáäéáíåßìåôå âÜóåé ôùí óõíèçêþí ôçò ÃåíéêÞò "
 "Äçìüóéáò ¶äåéáò GNU (GNU General Public Licence)."
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5322,10 +7099,11 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5363,13 +7141,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5404,91 +7185,95 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, fuzzy, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, fuzzy, c-format
 msgid "You may only specify one printer model."
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, fuzzy, c-format
 msgid "Unknown option %c\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, fuzzy, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, fuzzy, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, fuzzy, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Áíåðéôõ÷Þò óýíäåóç óôï ðéëüôï"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, fuzzy, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5496,84 +7281,227 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
 #, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+msgid "Status: Busy\n"
+msgstr ""
+
+#
+#: src/escputil/escputil.c:1020
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Êïñåóìüò:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 #, fuzzy
 msgid "Ink color"
 msgstr " ÷ñþìá"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 #, fuzzy
 msgid "Percent remaining"
 msgstr "Åðß ôïéò åêáôü åëåýèåñï"
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
 msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5612,7 +7540,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5648,12 +7576,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5665,38 +7598,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, fuzzy, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5706,44 +7639,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, fuzzy, c-format
 msgid "Unrecognized command.\n"
 msgstr "Üãíùóôï ÷ñþìá: %s"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5754,13 +7687,13 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 #, fuzzy
 msgid "Press enter to continue > "
 msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5768,43 +7701,43 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, fuzzy, c-format
 msgid "Number out of range!\n"
 msgstr "Áñéèìüò Óåëßäùí"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5813,7 +7746,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, fuzzy, c-format
 msgid "Error in input\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
@@ -5823,12 +7756,12 @@ msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
 msgid "Printing..."
 msgstr "Åêôõðþíåôáé .."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 #, fuzzy
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Ößëôñá/Êåßìåíï/FreeType..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5840,473 +7773,530 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr ""
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Óçìåßï ÐñïóÜñôçóçò: "
-
-#, fuzzy
-#~ msgid "PPD File?"
-#~ msgstr " Áñ÷åßï "
-
-#
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: ç åðéëïãÞ `%s' åßíáé áóáöÞò\n"
-
-#
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `--%s' äå äÝ÷åôáé üñéóìá\n"
-
-#
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `%c%s' äå äÝ÷åôáé üñéóìá\n"
-
-#
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n"
-
-#
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: Üãíùóôç åðéëïãÞ `--%s'\n"
-
-#
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: Üãíùóôç åðéëïãÞ `%c%s'\n"
-
-#
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ìç åðéôñåðüìåíç åðéëïãÞ -- %c\n"
-
-#
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: Üêõñç åðéëïãÞ -- %c'\n"
-
-#
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: ç åðéëïãÞ áðáéôåß üñéóìá -- %c\n"
-
-#
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé áóáöÞò\n"
-
-#
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé üñéóìá\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Åñãáóßá"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Ñüëïò"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "360 DPI FOL2"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#, fuzzy
-#~ msgid "ps2"
-#~ msgstr "óôéã."
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
 #, fuzzy
-#~ msgid "Stylus Photo"
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Slashdot"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
 #, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Óçìåßï ÐñïóÜñôçóçò: "
+
+#, fuzzy
+#~ msgid "PPD File?"
+#~ msgstr " Áñ÷åßï "
+
+#
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: ç åðéëïãÞ `%s' åßíáé áóáöÞò\n"
+
+#
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ç åðéëïãÞ `--%s' äå äÝ÷åôáé üñéóìá\n"
+
+#
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: ç åðéëïãÞ `%c%s' äå äÝ÷åôáé üñéóìá\n"
+
+#
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n"
+
+#
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: Üãíùóôç åðéëïãÞ `--%s'\n"
+
+#
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: Üãíùóôç åðéëïãÞ `%c%s'\n"
+
+#
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ìç åðéôñåðüìåíç åðéëïãÞ -- %c\n"
+
+#
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: Üêõñç åðéëïãÞ -- %c'\n"
+
+#
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: ç åðéëïãÞ áðáéôåß üñéóìá -- %c\n"
+
+#
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé áóáöÞò\n"
+
+#
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé üñéóìá\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Åñãáóßá"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Ñüëïò"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "360 DPI FOL2"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#, fuzzy
+#~ msgid "ps2"
+#~ msgstr "óôéã."
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
 #~ msgid "Model %d out of range.\n"
 #~ msgstr "Áñéèìüò Óåëßäùí"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index abedb69..78f5a36 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 3bc5e5f..70968e5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2004-09-23 00:10+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: British English\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr "Default"
 
@@ -73,12 +73,12 @@ msgstr "Predithered Input"
 msgid "Density"
 msgstr "Density"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -142,182 +142,182 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI"
 msgstr "90×90 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI DMT"
 msgstr "90×90 DPI DMT"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI"
 msgstr "180×180 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI DMT"
 msgstr "180×180 DPI DMT"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI"
 msgstr "360×360 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI DMT"
 msgstr "360×360 DPI DMT"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI"
 msgstr "720×360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI DMT"
 msgstr "720×360 DPI DMT"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI"
 msgstr "720×720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI DMT"
 msgstr "720×720 DPI DMT"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI"
 msgstr "1440×720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI DMT"
 msgstr "1440×720 DPI DMT"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI DMT"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI DMT"
 msgstr "2880×2880 DPI DMT"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI DMT"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI DMT"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI DMT"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI DMT"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI DMT"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI"
 msgstr "1200×1200 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI DMT"
 msgstr "1200×1200 DPI DMT"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI"
 msgstr "2400×2400 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI DMT"
 msgstr "2400×2400 DPI DMT"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Plain Paper"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Plain Paper"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparencies"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Back Print Film"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Fabric Sheets"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Envelope"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "High Resolution Paper"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt Transfers"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "High Gloss Film"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Glossy Photo Paper"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Glossy Photo Cards"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Photo Paper Pro"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -325,15 +325,15 @@ msgstr "Photo Paper Pro"
 msgid "Other"
 msgstr "Other"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr "Page Size"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -349,55 +349,55 @@ msgstr "Page Size"
 msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr "Size of the paper being printed to"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Media Type"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Media Source"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Resolution"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -406,21 +406,21 @@ msgstr "Ink Type"
 msgid "Advanced Printer Setup"
 msgstr "Advanced Printer Setup"
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 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:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -430,13 +430,13 @@ msgstr "Ink Channels"
 msgid "Advanced Printer Functionality"
 msgstr "Advanced Printer Functionality"
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -445,165 +445,166 @@ msgstr "Printing Mode"
 msgid "Core Parameter"
 msgstr "Core Parameter"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble Setting"
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta Curve"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Adjust the black balance"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr "Light Magenta Transition"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr "Off"
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Auto Sheet Feeder"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manual with Pause"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manual without Pause"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Matte Paper"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Black"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Photo CcMmYK Colour"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY Colour"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Photo CcMmY Colour"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK Colour"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Photo CcMmY Colour"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY Colour"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Photo CcMmYK Colour"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Black"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Black and White"
@@ -788,14 +789,15 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -803,14 +805,15 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -818,14 +821,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -833,10 +837,10 @@ msgstr "Yellow"
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr "Red"
 
@@ -853,10 +857,10 @@ msgstr "Green"
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr "Blue"
 
@@ -1074,77 +1078,77 @@ msgstr "Gray component reduction curve"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Value must be set for %s\n"
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is not a valid %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, 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:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, 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:573
+#: src/main/printers.c:617
 #, 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:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode must be %s\n"
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr "no wrap"
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr "wrap around"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unknown type parameter %s (%d)\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
 msgstr "Page size is not valid\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
 msgstr "Height must be greater than zero\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
 msgstr "Width must be greater than zero\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1153,7 +1157,7 @@ msgstr ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 
-#: src/main/printers.c:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1162,138 +1166,165 @@ msgstr ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
 msgstr "Manual Feed"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manual Selection"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manual Feed"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Tray"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Photo Paper"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr "Fast Economy"
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr "Economy"
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Draft"
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 msgid "High"
 msgstr "High"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Photo"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Best"
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Light Cyan/Red"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Light Magenta/Blue"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Black"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Black/Dark Yellow"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte Paper"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Photo Paper"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Black"
@@ -1476,128 +1507,128 @@ msgstr "Hue Map"
 msgid "Adjust the red map"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Density"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Adjust the red balance"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Density"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Adjust the blue balance"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Adjust the gloss balance"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr "Dark Yellow Transition"
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr "Gray Transition"
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
 msgstr "Light Gray Transition"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -1683,70 +1714,70 @@ msgstr "Six Colour Photo"
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1758,8 +1789,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr "Card"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr "None"
 
@@ -2171,62 +2202,88 @@ msgstr "1200 DPI highest quality"
 msgid "1440 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440×1440 DPI DMT"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1200 DPI highest quality"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1200 DPI highest quality"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1200 DPI highest quality"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1200 DPI highest quality"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Alignment Passes"
@@ -2314,7 +2371,8 @@ msgid "4x6"
 msgstr "4×6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2794,1421 +2852,3539 @@ msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Custom"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:144
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr "Canon BJC 30"
-
-#: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
-msgstr "Canon BJC 50"
-
-#: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
-msgstr "Canon BJC 55"
-
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
-msgstr "Canon BJC 80"
+#, fuzzy
+msgid "Canon BJ-30"
+msgstr "Canon BJC 30"
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
-msgstr "Canon BJC 85"
+#, fuzzy
+msgid "Canon BJC-50"
+msgstr "Canon BJC 50"
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
-msgstr "Canon BJC 210"
+#, fuzzy
+msgid "Canon BJC-55"
+msgstr "Canon BJC 55"
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
-msgstr "Canon BJC 240"
+#, fuzzy
+msgid "Canon BJC-80"
+msgstr "Canon BJC 80"
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
-msgstr "Canon BJC 250"
+#, fuzzy
+msgid "Canon BJC-85"
+msgstr "Canon BJC 85"
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
-msgstr "Canon BJC 1000"
+#, fuzzy
+msgid "Canon BJC-210"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
-msgstr "Canon BJC 2000"
+#, fuzzy
+msgid "Canon BJC-240"
+msgstr "Canon BJC 240"
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
-msgstr "Canon BJC 3000"
+#, fuzzy
+msgid "Canon BJC-250"
+msgstr "Canon BJC 250"
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
-msgstr "Canon BJC 4300"
+#, fuzzy
+msgid "Canon BJC-1000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
-msgstr "Canon BJC 4400 photo"
+#, fuzzy
+msgid "Canon BJC-2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
-msgstr "Canon BJC 6000"
+#, fuzzy
+msgid "Canon BJC-2010"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
-msgstr "Canon BJC 6100"
+#, fuzzy
+msgid "Canon BJC-2100"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
-msgstr "Canon BJC 6200"
+#, fuzzy
+msgid "Canon BJC-2110"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
-msgstr "Canon BJC 6500"
+#, fuzzy
+msgid "Canon BJC-3000"
+msgstr "Canon BJC 3000"
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+#, fuzzy
+msgid "Canon BJC-4000"
 msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
-msgstr "Canon BJC 7100"
+#, fuzzy
+msgid "Canon BJC-4300"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
-msgstr "Canon BJC 8200"
+#, fuzzy
+msgid "Canon BJC-4400"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:163
 #, fuzzy
-msgid "Canon S200"
-msgstr "Canon S400"
+msgid "Canon BJC-6000"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
-msgstr "Canon S400"
+#, fuzzy
+msgid "Canon BJC-6100"
+msgstr "Canon BJC 6100"
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
-msgstr "Canon S450"
+#, fuzzy
+msgid "Canon BJC-6200"
+msgstr "Canon BJC 6200"
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
-msgstr "Canon S800"
+#, fuzzy
+msgid "Canon BJC-6500"
+msgstr "Canon BJC 6500"
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
-msgstr "Canon S4500"
+#, fuzzy
+msgid "Canon BJC-7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:168
 #, fuzzy
-msgid "Canon PIXMA iP4000"
-msgstr "Canon S400"
+msgid "Canon BJC-7100"
+msgstr "Canon BJC 7100"
 
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20UX"
+msgid "Canon BJC-8200"
+msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+#, fuzzy
+msgid "Canon S100"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+#, fuzzy
+msgid "Canon S200"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S300"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41UX"
+msgid "Canon S500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+#, fuzzy
+msgid "Canon S600"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+#, fuzzy
+msgid "Canon S630"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42UX"
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+#, fuzzy
+msgid "Canon iP4000"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43UX"
+msgid "Epson Stylus C20"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+#, fuzzy
+msgid "Epson Stylus C20SX"
+msgstr "EPSON Stylus C20SX"
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+#, fuzzy
+msgid "Epson Stylus C20UX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44UX"
+msgid "Epson Stylus C40"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+#, fuzzy
+msgid "Epson Stylus C40SX"
+msgstr "EPSON Stylus C40SX"
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+#, fuzzy
+msgid "Epson Stylus C40UX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C45"
-msgstr "EPSON Stylus C45"
+#, fuzzy
+msgid "Epson Stylus C41"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C46"
-msgstr "EPSON Stylus C46"
+#, fuzzy
+msgid "Epson Stylus C41SX"
+msgstr "EPSON Stylus C41SX"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "EPSON Stylus C45"
+msgid "Epson Stylus C41UX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C50"
-msgstr "EPSON Stylus C50"
+#, fuzzy
+msgid "Epson Stylus C42"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C60"
-msgstr "EPSON Stylus C60"
+#, fuzzy
+msgid "Epson Stylus C42SX"
+msgstr "EPSON Stylus C42SX"
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C61"
-msgstr "EPSON Stylus C61"
+#, fuzzy
+msgid "Epson Stylus C42UX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C62"
-msgstr "EPSON Stylus C62"
+#, fuzzy
+msgid "Epson Stylus C43"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C63"
-msgstr "EPSON Stylus C63"
+#, fuzzy
+msgid "Epson Stylus C43SX"
+msgstr "EPSON Stylus C43SX"
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C64"
-msgstr "EPSON Stylus C64"
+#, fuzzy
+msgid "Epson Stylus C43UX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C65"
-msgstr "EPSON Stylus C65"
+#, fuzzy
+msgid "Epson Stylus C44"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus C66"
-msgstr "EPSON Stylus C66"
+#, fuzzy
+msgid "Epson Stylus C44SX"
+msgstr "EPSON Stylus C44SX"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus C44UX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus C70"
-msgstr "EPSON Stylus C70"
+#, fuzzy
+msgid "Epson Stylus C45"
+msgstr "EPSON Stylus C45"
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus C80"
-msgstr "EPSON Stylus C80"
+#, fuzzy
+msgid "Epson Stylus C46"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus C82"
-msgstr "EPSON Stylus C82"
+#, fuzzy
+msgid "Epson Stylus C48"
+msgstr "EPSON Stylus C45"
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus C83"
-msgstr "EPSON Stylus C83"
+#, fuzzy
+msgid "Epson Stylus C50"
+msgstr "EPSON Stylus C50"
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus C84"
-msgstr "EPSON Stylus C84"
+#, fuzzy
+msgid "Epson Stylus C60"
+msgstr "EPSON Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus C85"
-msgstr "EPSON Stylus C85"
+#, fuzzy
+msgid "Epson Stylus C61"
+msgstr "EPSON Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus C86"
-msgstr "EPSON Stylus C86"
+#, fuzzy
+msgid "Epson Stylus C62"
+msgstr "EPSON Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "EPSON Stylus C63"
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color"
-msgstr "EPSON Stylus Color"
+#, fuzzy
+msgid "Epson Stylus C64"
+msgstr "EPSON Stylus C64"
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color Pro"
-msgstr "EPSON Stylus Color Pro"
+#, fuzzy
+msgid "Epson Stylus C65"
+msgstr "EPSON Stylus C65"
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color Pro XL"
-msgstr "EPSON Stylus Color Pro XL"
+#, fuzzy
+msgid "Epson Stylus C66"
+msgstr "EPSON Stylus C66"
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 400"
-msgstr "EPSON Stylus Color 400"
+#, fuzzy
+msgid "Epson Stylus C68"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 440"
-msgstr "EPSON Stylus Color 440"
+#, fuzzy
+msgid "Epson Stylus C70"
+msgstr "EPSON Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 460"
-msgstr "EPSON Stylus Color 460"
+#, fuzzy
+msgid "Epson Stylus C80"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 480"
-msgstr "EPSON Stylus Color 480"
+#, fuzzy
+msgid "Epson Stylus C82"
+msgstr "EPSON Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 500"
-msgstr "EPSON Stylus Color 500"
+#, fuzzy
+msgid "Epson Stylus C83"
+msgstr "EPSON Stylus C83"
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 580"
-msgstr "EPSON Stylus Color 580"
+#, fuzzy
+msgid "Epson Stylus C84"
+msgstr "EPSON Stylus C84"
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 600"
-msgstr "EPSON Stylus Color 600"
+#, fuzzy
+msgid "Epson Stylus C85"
+msgstr "EPSON Stylus C85"
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 640"
-msgstr "EPSON Stylus Color 640"
+#, fuzzy
+msgid "Epson Stylus C86"
+msgstr "EPSON Stylus C86"
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 660"
-msgstr "EPSON Stylus Color 660"
+#, fuzzy
+msgid "Epson Stylus C88"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 670"
-msgstr "EPSON Stylus Color 670"
+#, fuzzy
+msgid "Epson Stylus Color"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 680"
-msgstr "EPSON Stylus Color 680"
+#, fuzzy
+msgid "Epson Stylus Color I"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 740"
-msgstr "EPSON Stylus Color 740"
+#, fuzzy
+msgid "Epson Stylus Color II"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 760"
-msgstr "EPSON Stylus Color 760"
+#, fuzzy
+msgid "Epson Stylus Color IIs"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 777"
-msgstr "EPSON Stylus Color 777"
+#, fuzzy
+msgid "Epson Stylus Color PRO"
+msgstr "EPSON Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 800"
-msgstr "EPSON Stylus Color 800"
+#, fuzzy
+msgid "Epson Stylus Pro XL"
+msgstr "EPSON Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Color 850"
-msgstr "EPSON Stylus Color 850"
+#, fuzzy
+msgid "Epson Stylus Color 400"
+msgstr "EPSON Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Color 860"
-msgstr "EPSON Stylus Color 860"
+#, fuzzy
+msgid "Epson Stylus Color 440"
+msgstr "EPSON Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Color 880"
-msgstr "EPSON Stylus Color 880"
+#, fuzzy
+msgid "Epson Stylus Color 460"
+msgstr "EPSON Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Color 83"
-msgstr "EPSON Stylus Color 83"
+#, fuzzy
+msgid "Epson Stylus Color 480"
+msgstr "EPSON Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Color 900"
-msgstr "EPSON Stylus Color 900"
+#, fuzzy
+msgid "Epson Stylus Color 500"
+msgstr "EPSON Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Color 980"
-msgstr "EPSON Stylus Color 980"
+#, fuzzy
+msgid "Epson Stylus Color 580"
+msgstr "EPSON Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Color 1160"
-msgstr "EPSON Stylus Color 1160"
+#, fuzzy
+msgid "Epson Stylus Color 600"
+msgstr "EPSON Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Color 1500"
-msgstr "EPSON Stylus Color 1500"
+#, fuzzy
+msgid "Epson Stylus Color 640"
+msgstr "EPSON Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Color 1520"
-msgstr "EPSON Stylus Color 1520"
+#, fuzzy
+msgid "Epson Stylus Color 660"
+msgstr "EPSON Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Color 3000"
-msgstr "EPSON Stylus Color 3000"
+#, fuzzy
+msgid "Epson Stylus Color 670"
+msgstr "EPSON Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo"
-msgstr "EPSON Stylus Photo"
+#, fuzzy
+msgid "Epson Stylus Color 680"
+msgstr "EPSON Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 700"
-msgstr "EPSON Stylus Photo 700"
+#, fuzzy
+msgid "Epson Stylus Color 740"
+msgstr "EPSON Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo EX"
-msgstr "EPSON Stylus Photo EX"
+#, fuzzy
+msgid "Epson Stylus Color 760"
+msgstr "EPSON Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+#, fuzzy
+msgid "Epson Stylus Color 777"
+msgstr "EPSON Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 720"
-msgstr "EPSON Stylus Photo 720"
+#, fuzzy
+msgid "Epson Stylus Color 800"
+msgstr "EPSON Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 750"
-msgstr "EPSON Stylus Photo 750"
+#, fuzzy
+msgid "Epson Stylus Color 850"
+msgstr "EPSON Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 780"
-msgstr "EPSON Stylus Photo 780"
+#, fuzzy
+msgid "Epson Stylus Color 860"
+msgstr "EPSON Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "EPSON Stylus Photo 785EPX"
+#, fuzzy
+msgid "Epson Stylus Color 880"
+msgstr "EPSON Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 790"
-msgstr "EPSON Stylus Photo 790"
+#, fuzzy
+msgid "Epson Stylus Color 8 3"
+msgstr "EPSON Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 810"
-msgstr "EPSON Stylus Photo 810"
+#, fuzzy
+msgid "Epson Stylus Color 900"
+msgstr "EPSON Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 820"
-msgstr "EPSON Stylus Photo 820"
+#, fuzzy
+msgid "Epson Stylus Color 980"
+msgstr "EPSON Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+#, fuzzy
+msgid "Epson Stylus Color 1160"
+msgstr "EPSON Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 830"
-msgstr "EPSON Stylus Photo 830"
+#, fuzzy
+msgid "Epson Stylus Color 1500"
+msgstr "EPSON Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 870"
-msgstr "EPSON Stylus Photo 870"
+#, fuzzy
+msgid "Epson Stylus Color 1520"
+msgstr "EPSON Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 875"
-msgstr "EPSON Stylus Photo 875"
+#, fuzzy
+msgid "Epson Stylus Color 3000"
+msgstr "EPSON Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 890"
-msgstr "EPSON Stylus Photo 890"
+#, fuzzy
+msgid "Epson Stylus Photo"
+msgstr "EPSON Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 895"
-msgstr "EPSON Stylus Photo 895"
+#, fuzzy
+msgid "Epson Stylus Photo 700"
+msgstr "EPSON Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 900"
-msgstr "EPSON Stylus Photo 900"
+#, fuzzy
+msgid "Epson Stylus Photo EX"
+msgstr "EPSON Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 915"
-msgstr "EPSON Stylus Photo 915"
+#, fuzzy
+msgid "Epson Stylus Photo EX3"
+msgstr "EPSON Stylus Photo EX3"
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 925"
-msgstr "EPSON Stylus Photo 925"
+#, fuzzy
+msgid "Epson Stylus Photo 720"
+msgstr "EPSON Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+#, fuzzy
+msgid "Epson Stylus Photo 750"
+msgstr "EPSON Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo 950"
-msgstr "EPSON Stylus Photo 950"
+#, fuzzy
+msgid "Epson Stylus Photo 780"
+msgstr "EPSON Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo 960"
-msgstr "EPSON Stylus Photo 960"
+#, fuzzy
+msgid "Epson Stylus Photo 785"
+msgstr "EPSON Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo 1200"
-msgstr "EPSON Stylus Photo 1200"
+#, fuzzy
+msgid "Epson Stylus Photo 790"
+msgstr "EPSON Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo 1270"
-msgstr "EPSON Stylus Photo 1270"
+#, fuzzy
+msgid "Epson Stylus Photo 810"
+msgstr "EPSON Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo 1280"
-msgstr "EPSON Stylus Photo 1280"
+#, fuzzy
+msgid "Epson Stylus Photo 820"
+msgstr "EPSON Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo 1290"
-msgstr "EPSON Stylus Photo 1290"
+#, fuzzy
+msgid "Epson Stylus Photo 825"
+msgstr "EPSON Stylus Photo 825"
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo 2000P"
-msgstr "EPSON Stylus Photo 2000P"
+#, fuzzy
+msgid "Epson Stylus Photo 830"
+msgstr "EPSON Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo 2100"
-msgstr "EPSON Stylus Photo 2100"
+#, fuzzy
+msgid "Epson Stylus Photo 830U"
+msgstr "EPSON Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo 2200"
-msgstr "EPSON Stylus Photo 2200"
+#, fuzzy
+msgid "Epson Stylus Photo 870"
+msgstr "EPSON Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+#, fuzzy
+msgid "Epson Stylus Photo 875"
+msgstr "EPSON Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "EPSON Stylus Photo 2100"
+msgid "Epson Stylus Photo 890"
+msgstr "EPSON Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "EPSON Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "EPSON Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+#, fuzzy
+msgid "Epson Stylus Photo 900"
+msgstr "EPSON Stylus Photo 900"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 915"
+msgstr "EPSON Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 925"
+msgstr "EPSON Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 935"
+msgstr "EPSON Stylus Photo 935"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo 950"
+msgstr "EPSON Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 960"
+msgstr "EPSON Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 1200"
+msgstr "EPSON Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 1270"
+msgstr "EPSON Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+#, fuzzy
+msgid "Epson Stylus Photo 1280"
+msgstr "EPSON Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo 1290"
+msgstr "EPSON Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+#, fuzzy
+msgid "Epson Stylus Photo 2000P"
+msgstr "EPSON Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX600"
+msgid "Epson Stylus Photo 2100"
+msgstr "EPSON Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX600"
+msgid "Epson Stylus Photo 2200"
+msgstr "EPSON Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo R200"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+#, fuzzy
+msgid "Epson Stylus Photo R210"
+msgstr "EPSON Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R800"
+msgid "Epson Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo R300"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus Pro 5000"
-msgstr "EPSON Stylus Pro 5000"
+#, fuzzy
+msgid "Epson Stylus Photo R310"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus Pro 5500"
-msgstr "EPSON Stylus Pro 5500"
+#, fuzzy
+msgid "Epson Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus Pro 7000"
-msgstr "EPSON Stylus Pro 7000"
+#, fuzzy
+msgid "Epson Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus Pro 7500"
-msgstr "EPSON Stylus Pro 7500"
+#, fuzzy
+msgid "Epson Stylus Photo RX400"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus Pro 7600"
-msgstr "EPSON Stylus Pro 7600"
+#, fuzzy
+msgid "Epson Stylus Photo RX420"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus Pro 9000"
-msgstr "EPSON Stylus Pro 9000"
+#, fuzzy
+msgid "Epson Stylus Photo RX425"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus Pro 9500"
-msgstr "EPSON Stylus Pro 9500"
+#, fuzzy
+msgid "Epson Stylus Photo RX430"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus Pro 9600"
-msgstr "EPSON Stylus Pro 9600"
+#, fuzzy
+msgid "Epson Stylus Photo RX500"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus Pro 10000"
-msgstr "EPSON Stylus Pro 10000"
+#, fuzzy
+msgid "Epson Stylus Photo RX510"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus Scan 2000"
-msgstr "EPSON Stylus Scan 2000"
+#, fuzzy
+msgid "Epson Stylus Photo RX600"
+msgstr "EPSON Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus Scan 2500"
-msgstr "EPSON Stylus Scan 2500"
+#, fuzzy
+msgid "Epson Stylus Photo RX620"
+msgstr "EPSON Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus Photo RX630"
+msgstr "EPSON Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "EPSON Stylus CX-3200"
+msgid "Epson Stylus Photo R800"
+msgstr "EPSON Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus Photo R1800"
+msgstr "EPSON Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "EPSON Stylus CX-8300"
+msgid "Epson Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus Pro 5000"
+msgstr "EPSON Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX-8300"
+msgid "Epson Stylus Pro 5500"
+msgstr "EPSON Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Pro 7000"
+msgstr "EPSON Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "EPSON Stylus C85"
+msgid "Epson Stylus Pro 7500"
+msgstr "EPSON Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus Pro 7600"
+msgstr "EPSON Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Pro 9000"
+msgstr "EPSON Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Pro 9500"
+msgstr "EPSON Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Pro 9600"
+msgstr "EPSON Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Pro 10000"
+msgstr "EPSON Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Scan 2000"
+msgstr "EPSON Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus Scan 2500"
+msgstr "EPSON Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "EPSON Stylus CX-5100"
+msgid "Epson Stylus CX1500"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "EPSON Stylus CX-5200"
+msgid "Epson Stylus CX3100"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
-msgstr "EPSON Stylus CX-5300"
+msgid "Epson Stylus CX3200"
+msgstr "EPSON Stylus CX-3200"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
-msgstr "EPSON Stylus CX-5400"
+msgid "Epson Stylus CX3500"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus CX3650"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
-msgstr "EPSON Stylus CX-6300"
+msgid "Epson Stylus CX3700"
+msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
-msgstr "EPSON Stylus CX-6400"
+msgid "Epson Stylus CX3800"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "EPSON Stylus CX-8300"
+msgid "Epson Stylus CX3805"
+msgstr "EPSON Stylus C85"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
-msgstr "EPSON Stylus CX-6600"
+msgid "Epson Stylus CX3810"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "EPSON Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
-msgstr "EPSON Stylus CX-8300"
+msgid "Epson Stylus CX4500"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus CX4700"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus CX5100"
+msgstr "EPSON Stylus CX-5100"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "EPSON Stylus CX-3100"
+msgid "Epson Stylus CX5200"
+msgstr "EPSON Stylus CX-5200"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
-msgstr "EPSON Stylus CX-3200"
+msgid "Epson Stylus CX5300"
+msgstr "EPSON Stylus CX-5300"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "EPSON Stylus C50"
+msgid "Epson Stylus CX5400"
+msgstr "EPSON Stylus CX-5400"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
-msgstr "EPSON Stylus CX-8400"
+msgid "Epson Stylus CX5700"
+msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "EPSON Stylus CX-6300"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr "EPSON CL-700"
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "EPSON Stylus CX-6400"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr "EPSON CL-750"
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr "EPSON CL-760"
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "EPSON Stylus CX-6600"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "EPSON EM-900C"
+msgid "Epson Stylus CX7700"
+msgstr "EPSON Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr "EPSON EM-900C"
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr "EPSON EM-930C"
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr "EPSON MC-2000"
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr "EPSON MC-5000"
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr "EPSON MC-7000"
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr "EPSON MC-9000"
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr "EPSON MC-10000"
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "EPSON Stylus CX-3100"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr "EPSON MJ-930C"
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "EPSON Stylus CX-3200"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr "EPSON MJ-5100C"
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "EPSON Stylus C50"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr "EPSON MJ-6000C"
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
-msgstr "EPSON MJ-8000C"
+msgid "Epson PictureMate"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
-msgstr "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
-msgstr "EPSON PM-730C"
+#, fuzzy
+msgid "Epson CL 700"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
-msgstr "EPSON PM-740C"
+msgid "Epson CL 750"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
-msgstr "EPSON PM-750C"
+msgid "Epson CL 760"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
-msgstr "EPSON PM-760C"
+msgid "Epson E 100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
-msgstr "EPSON PM-770C"
+msgid "Epson E 150"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
-msgstr "EPSON PM-780C"
+msgid "Epson E 200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
-msgstr "EPSON PM-790PT"
+#, fuzzy
+msgid "Epson EM 900C"
+msgstr "EPSON EM-900C"
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
-msgstr "EPSON PM-800C"
+#, fuzzy
+msgid "Epson EM 930C"
+msgstr "EPSON EM-930C"
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
-msgstr "EPSON PM-850PT"
+#, fuzzy
+msgid "Epson MC 2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
-msgstr "EPSON PM-870C"
+#, fuzzy
+msgid "Epson MC 5000"
+msgstr "EPSON MC-5000"
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
-msgstr "EPSON PM-880C"
+#, fuzzy
+msgid "Epson MC 7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
-msgstr "EPSON PM-930C"
+#, fuzzy
+msgid "Epson MC 9000"
+msgstr "EPSON MC-9000"
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
-msgstr "EPSON PM-940C"
+#, fuzzy
+msgid "Epson MC 10000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
-msgstr "EPSON PM-950C"
+#, fuzzy
+msgid "Epson MJ 930C"
+msgstr "EPSON MJ-930C"
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
-msgstr "EPSON PM-970C"
+#, fuzzy
+msgid "Epson MJ 5100C"
+msgstr "EPSON MJ-5100C"
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
-msgstr "EPSON PM-980C"
+#, fuzzy
+msgid "Epson MJ 6000C"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
-msgstr "EPSON PM-2000C"
+#, fuzzy
+msgid "Epson MJ 8000C"
+msgstr "EPSON MJ-8000C"
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
-msgstr "EPSON PM-2200C"
+#, fuzzy
+msgid "Epson PM 700C"
+msgstr "EPSON PM-700C"
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
-msgstr "EPSON PM-3000C"
+#, fuzzy
+msgid "Epson PM 730C"
+msgstr "EPSON PM-730C"
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
-msgstr "EPSON PM-3300C"
+#, fuzzy
+msgid "Epson PM 740C"
+msgstr "EPSON PM-740C"
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
-msgstr "EPSON PM-3500C"
+#, fuzzy
+msgid "Epson PM 750C"
+msgstr "EPSON PM-750C"
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
-msgstr "EPSON PM-3700C"
+#, fuzzy
+msgid "Epson PM 760C"
+msgstr "EPSON PM-760C"
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
-msgstr "EPSON PM-4000PX"
+#, fuzzy
+msgid "Epson PM 770C"
+msgstr "EPSON PM-770C"
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
-msgstr "EPSON PM-5000C"
+#, fuzzy
+msgid "Epson PM 780C"
+msgstr "EPSON PM-780C"
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
-msgstr "EPSON PM-7000C"
+#, fuzzy
+msgid "Epson PM 790PT"
+msgstr "EPSON PM-790PT"
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
-msgstr "EPSON PM-9000C"
+#, fuzzy
+msgid "Epson PM 800C"
+msgstr "EPSON PM-800C"
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
-msgstr "EPSON PM-10000"
+#, fuzzy
+msgid "Epson PM 850PT"
+msgstr "EPSON PM-850PT"
 
 #: src/main/xmli18n-tmp.h:378
 #, fuzzy
-msgid "EPSON PM-A900"
-msgstr "EPSON PM-9000C"
+msgid "Epson PM 870C"
+msgstr "EPSON PM-870C"
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PM-D750"
-msgstr "EPSON PM-D750"
+#, fuzzy
+msgid "Epson PM 880C"
+msgstr "EPSON PM-880C"
 
 #: src/main/xmli18n-tmp.h:380
 #, fuzzy
-msgid "EPSON PM-D770"
-msgstr "EPSON PM-770C"
+msgid "Epson PM 930C"
+msgstr "EPSON PM-930C"
 
 #: src/main/xmli18n-tmp.h:381
 #, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "EPSON PM-10000"
+msgid "Epson PM 940C"
+msgstr "EPSON PM-940C"
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PM-G700"
-msgstr "EPSON PM-G700"
+#, fuzzy
+msgid "Epson PM 950C"
+msgstr "EPSON PM-950C"
 
 #: src/main/xmli18n-tmp.h:383
 #, fuzzy
-msgid "EPSON PM-G720"
-msgstr "EPSON PM-G700"
+msgid "Epson PM 970C"
+msgstr "EPSON PM-970C"
 
 #: src/main/xmli18n-tmp.h:384
-msgid "EPSON PM-G800"
-msgstr "EPSON PM-G800"
+#, fuzzy
+msgid "Epson PM 980C"
+msgstr "EPSON PM-980C"
 
 #: src/main/xmli18n-tmp.h:385
 #, fuzzy
-msgid "EPSON PM-G820"
-msgstr "EPSON PM-G800"
+msgid "Epson PM 2000C"
+msgstr "EPSON PM-2000C"
 
 #: src/main/xmli18n-tmp.h:386
 #, fuzzy
-msgid "EPSON PX-A650"
-msgstr "EPSON PX-V600"
+msgid "Epson PM 2200C"
+msgstr "EPSON PM-2200C"
 
 #: src/main/xmli18n-tmp.h:387
 #, fuzzy
-msgid "EPSON PX-G900"
-msgstr "EPSON PX-9000"
+msgid "Epson PM 3000C"
+msgstr "EPSON PM-3000C"
 
 #: src/main/xmli18n-tmp.h:388
 #, fuzzy
-msgid "EPSON PX-G920"
-msgstr "EPSON PX-9000"
+msgid "Epson PM 3300C"
+msgstr "EPSON PM-3300C"
 
 #: src/main/xmli18n-tmp.h:389
 #, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "EPSON PX-9000"
+msgid "Epson PM 3500C"
+msgstr "EPSON PM-3500C"
 
 #: src/main/xmli18n-tmp.h:390
-msgid "EPSON PX-V500"
-msgstr "EPSON PX-V500"
+#, fuzzy
+msgid "Epson PM 3700C"
+msgstr "EPSON PM-3700C"
 
 #: src/main/xmli18n-tmp.h:391
-msgid "EPSON PX-V600"
-msgstr "EPSON PX-V600"
+#, fuzzy
+msgid "Epson PM 4000PX"
+msgstr "EPSON PM-4000PX"
 
 #: src/main/xmli18n-tmp.h:392
 #, fuzzy
-msgid "EPSON PX-5500"
-msgstr "EPSON PX-V500"
+msgid "Epson PM 5000C"
+msgstr "EPSON PM-5000C"
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
-msgstr "EPSON PX-7000"
+#, fuzzy
+msgid "Epson PM 7000C"
+msgstr "EPSON PM-7000C"
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
-msgstr "EPSON PX-9000"
+#, fuzzy
+msgid "Epson PM 9000C"
+msgstr "EPSON PM-9000C"
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr "Apple Colour StyleWriter 4100"
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "EPSON PM-10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
-msgstr "Apple Colour StyleWriter 4500"
+msgid "Epson PM A650"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
-msgstr "Apple Colour StyleWriter 6500"
+msgid "Epson PM A750"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
-msgstr "HP DeskJet 340"
+msgid "Epson PM A890"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr "HP DeskJet 400"
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "EPSON PM-9000C"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
-msgstr "HP DeskJet 500"
+msgid "Epson PM A950"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
-msgstr "HP DesignJet 230"
+msgid "Epson PM D600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr "HP DesignJet 250C"
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "EPSON PM-D750"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr "HP DesignJet 700"
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "EPSON PM-770C"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
-msgstr "HP DesignJet 750C"
+msgid "Epson PM D800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr "HP DesignJet 2500C"
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "EPSON PM-10000"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr "HP DesignJet 3500C"
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "EPSON PM-G700"
 
 #: src/main/xmli18n-tmp.h:407
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "EPSON PM-G700"
+
+#: src/main/xmli18n-tmp.h:408
+msgid "Epson PM G730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:409
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "EPSON PM-G800"
+
+#: src/main/xmli18n-tmp.h:410
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "EPSON PM-G800"
+
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:412
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:413
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:415
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:416
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:417
+msgid "Epson PX V630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:418
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:419
+#, fuzzy
+msgid "Epson PX 7000"
+msgstr "EPSON PX-7000"
+
+#: src/main/xmli18n-tmp.h:420
+#, fuzzy
+msgid "Epson PX 9000"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:421
+msgid "Apollo P-2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:422
+msgid "Apollo P-2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:423
+msgid "Apollo P-2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:424
+msgid "Apollo P-2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:425
+msgid "Apollo P-2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:426
+msgid "Apollo P-2550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:427
+msgid "Apollo P-2600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:428
+msgid "Apollo P-2650"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:429
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Colour StyleWriter 4100"
+
+#: src/main/xmli18n-tmp.h:430
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Colour StyleWriter 4500"
+
+#: src/main/xmli18n-tmp.h:431
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Colour StyleWriter 6500"
+
+#: src/main/xmli18n-tmp.h:432
+msgid "Apple LaserWriter Select 360"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:433
+msgid "Brother DCP-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:434
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:435
+msgid "Brother HL-10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:436
+msgid "Brother HL-10h"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:437
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Brother HL-1040"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Brother HL-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Brother HL-1060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Brother HL-1070"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Brother HL-1240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Brother HL-1250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Brother HL-1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Brother HL-1270N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Brother HL-1440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Brother HL-1660e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Brother HL-2060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Brother MFC-6550MC"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Brother MFC-8300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:454
+msgid "Brother MFC-9500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
+msgid "Brother MFC-9600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:456
+#, fuzzy
+msgid "Canon GP 335"
+msgstr "Canon BJC 85"
+
+#: src/main/xmli18n-tmp.h:457
+#, fuzzy
+msgid "Canon LBP-4sx"
+msgstr "Canon BJC 240"
+
+#: src/main/xmli18n-tmp.h:458
+#, fuzzy
+msgid "Canon LBP-430"
+msgstr "Canon BJC 4300"
+
+#: src/main/xmli18n-tmp.h:459
+#, fuzzy
+msgid "Canon LBP-1000"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:460
+#, fuzzy
+msgid "Canon LBP-1260"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:461
+#, fuzzy
+msgid "Canon LBP-1760"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Canon imageRunner 330s"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Citizen ProJet II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:464
+msgid "DEC 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:465
+msgid "DEC LN17"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Define New Printer"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Define New Printer"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Define New Printer"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Define New Printer"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+#, fuzzy
+msgid "HP Business Inkjet 2200"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:495
+#, fuzzy
+msgid "HP Business Inkjet 2230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:496
+#, fuzzy
+msgid "HP Business Inkjet 2250"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+#, fuzzy
+msgid "HP Business Inkjet 2280"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+#, fuzzy
+msgid "HP Color LaserJet 2500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:502
+#, fuzzy
+msgid "HP Color LaserJet 4500"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "HP Color LaserJet 4550"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:504
+#, fuzzy
+msgid "HP Color LaserJet 4600"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:505
+#, fuzzy
+msgid "HP Color LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:506
+#, fuzzy
+msgid "HP Color LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:507
+#, fuzzy
+msgid "HP Color LaserJet 5500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:508
+#, fuzzy
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:511
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:512
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:513
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:514
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:516
+#, fuzzy
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:518
+#, fuzzy
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500C"
+
+#: src/main/xmli18n-tmp.h:519
+#, fuzzy
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500C"
+
+#: src/main/xmli18n-tmp.h:520
+#, fuzzy
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:522
+#, fuzzy
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:523
+#, fuzzy
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:525
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:526
+#, fuzzy
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:527
+#, fuzzy
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:528
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:529
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:530
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:531
+#, fuzzy
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:532
+#, fuzzy
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:533
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr "HP DeskJet 600/600C"
+#: src/main/xmli18n-tmp.h:534
+#, fuzzy
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
-msgstr "HP DeskJet 600 series"
+#: src/main/xmli18n-tmp.h:535
+#, fuzzy
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr "HP DeskJet 690 series"
+#: src/main/xmli18n-tmp.h:536
+#, fuzzy
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:537
+#, fuzzy
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:538
+#, fuzzy
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:539
+#, fuzzy
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:540
+#, fuzzy
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:541
+#, fuzzy
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:542
+#, fuzzy
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:543
+#, fuzzy
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:544
+#, fuzzy
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:545
+#, fuzzy
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:546
+#, fuzzy
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:547
+#, fuzzy
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:548
+#, fuzzy
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:549
+#, fuzzy
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:550
+#, fuzzy
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:551
+#, fuzzy
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:552
+#, fuzzy
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:553
+#, fuzzy
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:554
+#, fuzzy
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:555
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:556
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:557
+#, fuzzy
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:558
+#, fuzzy
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:559
+#, fuzzy
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:560
+#, fuzzy
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:561
+#, fuzzy
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:562
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:563
+#, fuzzy
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:564
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:565
+#, fuzzy
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:566
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:567
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:568
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:570
+#, fuzzy
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:571
+#, fuzzy
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
-msgstr "HP DeskJet 900 series"
+#: src/main/xmli18n-tmp.h:574
+#, fuzzy
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:575
+#, fuzzy
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:576
+#, fuzzy
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:577
+#, fuzzy
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:578
+#, fuzzy
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:579
+#, fuzzy
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:580
+#, fuzzy
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:581
+#, fuzzy
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:582
+#, fuzzy
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:583
+#, fuzzy
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:584
+#, fuzzy
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:585
+#, fuzzy
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:586
+#, fuzzy
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:587
+#, fuzzy
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:588
+#, fuzzy
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:589
+#, fuzzy
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:590
+#, fuzzy
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:591
+#, fuzzy
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:592
+#, fuzzy
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:593
+#, fuzzy
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:594
+#, fuzzy
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:597
+#, fuzzy
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
-msgstr "HP DeskJet 2000 series"
+#: src/main/xmli18n-tmp.h:601
+#, fuzzy
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
-msgstr "HP DeskJet 2500 series"
+#: src/main/xmli18n-tmp.h:602
+#, fuzzy
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
-msgstr "HP PhotoSmart P1000"
+#: src/main/xmli18n-tmp.h:603
+#, fuzzy
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
-msgstr "HP PhotoSmart P1100"
+#: src/main/xmli18n-tmp.h:604
+#, fuzzy
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
-msgstr "HP LaserJet II series"
+#: src/main/xmli18n-tmp.h:605
+#, fuzzy
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+#: src/main/xmli18n-tmp.h:606
+#, fuzzy
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:607
+#, fuzzy
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:608
+#, fuzzy
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:609
+#, fuzzy
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:610
+#, fuzzy
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:611
+#, fuzzy
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:612
+#, fuzzy
+msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP series"
 
-#: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
-msgstr "HP LaserJet III series"
+#: src/main/xmli18n-tmp.h:613
+#, fuzzy
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
-msgstr "HP LaserJet 4 series"
+#: src/main/xmli18n-tmp.h:614
+#, fuzzy
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+#: src/main/xmli18n-tmp.h:615
+#, fuzzy
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:616
+#, fuzzy
+msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+#: src/main/xmli18n-tmp.h:617
+#, fuzzy
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:618
+#, fuzzy
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:619
+#, fuzzy
+msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:621
+#, fuzzy
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:622
+#, fuzzy
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:623
+#, fuzzy
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:624
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
-msgstr "HP LaserJet 5 series"
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:626
+#, fuzzy
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:627
+#, fuzzy
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:628
+#, fuzzy
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:629
+#, fuzzy
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:630
+#, fuzzy
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:631
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
-msgstr "HP LaserJet 6 series"
+#: src/main/xmli18n-tmp.h:632
+#, fuzzy
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:633
+#, fuzzy
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:634
+#, fuzzy
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:635
+#, fuzzy
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:636
+#, fuzzy
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:637
+#, fuzzy
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:638
+#, fuzzy
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:639
+#, fuzzy
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:640
+#, fuzzy
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:641
+#, fuzzy
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:642
+#, fuzzy
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:643
+#, fuzzy
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:644
+#, fuzzy
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:645
+#, fuzzy
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:646
+#, fuzzy
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:647
+#, fuzzy
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:648
+#, fuzzy
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:649
+#, fuzzy
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:650
+#, fuzzy
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:651
+#, fuzzy
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:652
+#, fuzzy
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:653
+#, fuzzy
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:654
+#, fuzzy
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:655
+#, fuzzy
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:656
+#, fuzzy
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:657
+#, fuzzy
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:658
+#, fuzzy
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:659
+#, fuzzy
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:660
+#, fuzzy
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:661
+#, fuzzy
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:662
+#, fuzzy
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:663
+#, fuzzy
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:664
+#, fuzzy
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:665
+#, fuzzy
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:666
+#, fuzzy
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:667
+#, fuzzy
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+#, fuzzy
+msgid "HP OfficeJet 300"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:671
+#, fuzzy
+msgid "HP OfficeJet 330"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:672
+#, fuzzy
+msgid "HP OfficeJet 350"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:673
+#, fuzzy
+msgid "HP OfficeJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:674
+#, fuzzy
+msgid "HP OfficeJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:675
+#, fuzzy
+msgid "HP OfficeJet 570"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:676
+#, fuzzy
+msgid "HP OfficeJet 580"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:677
+#, fuzzy
+msgid "HP OfficeJet 590"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:678
+#, fuzzy
+msgid "HP OfficeJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:679
+#, fuzzy
+msgid "HP OfficeJet 610"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:680
+#, fuzzy
+msgid "HP OfficeJet 625"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:681
+#, fuzzy
+msgid "HP OfficeJet 630"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:682
+#, fuzzy
+msgid "HP OfficeJet 635"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:683
+#, fuzzy
+msgid "HP OfficeJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:684
+#, fuzzy
+msgid "HP OfficeJet 710"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:685
+#, fuzzy
+msgid "HP OfficeJet 720"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:686
+#, fuzzy
+msgid "HP OfficeJet 725"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:687
+#, fuzzy
+msgid "HP OfficeJet 5105"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:688
+#, fuzzy
+msgid "HP OfficeJet 5110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:689
+#, fuzzy
+msgid "HP OfficeJet 5110xi"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:690
+#, fuzzy
+msgid "HP OfficeJet 6105"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:691
+#, fuzzy
+msgid "HP OfficeJet 6110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:692
+#, fuzzy
+msgid "HP OfficeJet 7110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:693
+#, fuzzy
+msgid "HP OfficeJet 7130"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:694
+#, fuzzy
+msgid "HP OfficeJet 7140"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:695
+#, fuzzy
+msgid "HP OfficeJet D125"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+#, fuzzy
+msgid "HP OfficeJet D145"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:698
+#, fuzzy
+msgid "HP OfficeJet D155"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:699
+#, fuzzy
+msgid "HP OfficeJet G55"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:700
+#, fuzzy
+msgid "HP OfficeJet G85"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:701
+#, fuzzy
+msgid "HP OfficeJet G95"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:702
+#, fuzzy
+msgid "HP OfficeJet K60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:703
+#, fuzzy
+msgid "HP OfficeJet K60xi"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:704
+#, fuzzy
+msgid "HP OfficeJet K80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:705
+#, fuzzy
+msgid "HP OfficeJet K80xi"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:706
+#, fuzzy
+msgid "HP OfficeJet LX"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:707
+#, fuzzy
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:708
+#, fuzzy
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+#, fuzzy
+msgid "HP OfficeJet R40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:711
+#, fuzzy
+msgid "HP OfficeJet R45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:712
+#, fuzzy
+msgid "HP OfficeJet R60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:713
+#, fuzzy
+msgid "HP OfficeJet R65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:714
+#, fuzzy
+msgid "HP OfficeJet R80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:715
+#, fuzzy
+msgid "HP OfficeJet T45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:716
+#, fuzzy
+msgid "HP OfficeJet T65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:717
+#, fuzzy
+msgid "HP OfficeJet V40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:718
+#, fuzzy
+msgid "HP OfficeJet V40xi"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+#, fuzzy
+msgid "HP PSC 2110"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+#, fuzzy
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:730
+#, fuzzy
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:731
+#, fuzzy
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:732
+#, fuzzy
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:733
+#, fuzzy
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:734
+#, fuzzy
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:735
+#, fuzzy
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:738
+#, fuzzy
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:739
+#, fuzzy
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:740
+#, fuzzy
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:741
+#, fuzzy
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:796
+#, fuzzy
+msgid "Lexmark Optra E"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+#, fuzzy
+msgid "Sony IJP-V100"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Setup Printer"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:864
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:865
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:866
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+#: src/main/xmli18n-tmp.h:867
+#, fuzzy
+msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+#: src/main/xmli18n-tmp.h:868
+#, fuzzy
+msgid "Olympus P-11"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:869
+#, fuzzy
+msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+#: src/main/xmli18n-tmp.h:870
+#, fuzzy
+msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+#: src/main/xmli18n-tmp.h:871
+#, fuzzy
+msgid "Olympus P-300E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:872
+#, fuzzy
+msgid "Olympus P-300U"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:873
+#, fuzzy
+msgid "Olympus P-330E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:874
+#, fuzzy
+msgid "Olympus P-330NE"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:875
+#, fuzzy
+msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+#: src/main/xmli18n-tmp.h:876
+#, fuzzy
+msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+#: src/main/xmli18n-tmp.h:877
+#, fuzzy
+msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+#: src/main/xmli18n-tmp.h:878
+#, fuzzy
+msgid "Canon CP-200"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:879
+#, fuzzy
+msgid "Canon CP-220"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:880
+#, fuzzy
+msgid "Canon CP-300"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:881
+#, fuzzy
+msgid "Canon CP-330"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:882
+#, fuzzy
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:883
+#, fuzzy
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:884
+#, fuzzy
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:885
+#, fuzzy
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:886
+#, fuzzy
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:887
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:888
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+#: src/main/xmli18n-tmp.h:889
+#, fuzzy
+msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+#: src/main/xmli18n-tmp.h:890
+#, fuzzy
+msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:891
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
@@ -4884,70 +7060,71 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 msgid "Printer Features"
 msgstr "Printer Features"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr "Output Control"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 msgid "Common"
 msgstr "Common"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "English-GB"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
+#, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -4957,9 +7134,10 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -4991,11 +7169,12 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5033,6 +7212,8 @@ msgid ""
 "    -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 ""
 "Usage: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -5071,12 +7252,13 @@ msgstr ""
 "    -m|--model         Specify the precise printer model for head "
 "alignment.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5111,6 +7293,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
@@ -5146,74 +7330,84 @@ msgstr ""
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, 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:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "You may only specify one printer model."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Unknown option %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Cannot open device %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Unable to send command to printer\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Read from printer timed out\n"
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Cannot read from %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Cannot open %s read/write: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5222,15 +7416,7 @@ msgstr ""
 "\n"
 "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5241,83 +7427,225 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obtaining ink levels requires using a raw device.\n"
+msgid "Status: Waiting\n"
+msgstr "Saturation"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Error in input\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Error in input\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Ink colour"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "This printer does not support raw printer output at depth %d\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Obtaining ink levels requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obtaining ink levels requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 #, fuzzy
 msgid "Date"
 msgstr "Draft"
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "You may only specify one printer model."
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Cleaning heads...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Running nozzle check, please ensure paper is in the printer.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5390,7 +7718,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5457,12 +7785,17 @@ msgstr ""
 "this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Unable to send command to the printer, exiting.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5481,20 +7814,20 @@ msgstr ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5503,7 +7836,7 @@ msgstr ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5512,12 +7845,12 @@ msgstr ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repeating the alignment process.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5532,17 +7865,17 @@ msgstr ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "About to save settings..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "failed!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5551,27 +7884,27 @@ msgstr ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "succeeded!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Your alignment settings have been saved to the printer.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unrecognised command.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Final command was not confirmed.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5588,12 +7921,12 @@ msgstr ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Press enter to continue > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5604,42 +7937,42 @@ msgstr ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Please insert a fresh sheet of paper.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Number out of range!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "I cannot understand what you typed!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Attempting to set alignment..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "succeeded.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5652,7 +7985,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Error in input\n"
@@ -5661,11 +7994,11 @@ msgstr "Error in input\n"
 msgid "Printing..."
 msgstr "Printing..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/File/Print..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5677,118 +8010,189 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Bad colour space: bps %d channels %d space %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "No row buffer\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Unable to parse parameter %s=%s (expect a number)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Printer must be specified with -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Printer %s is not a known model\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Unknown type parameter %s (%d)\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Get next row failed at %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header failed %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init failed %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Unable to open file descriptor: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Unable to open %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Unknown printer %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Bad parameters; cannot continue!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Get next row failed at %.0f\n"
 
 #, fuzzy
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header failed %d\n"
+
+#~ msgid "Canon BJC 4400 photo"
+#~ msgstr "Canon BJC 4400 photo"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP4000"
+#~ msgstr "Canon S400"
+
+#~ msgid "EPSON Stylus Photo 785EPX"
+#~ msgstr "EPSON Stylus Photo 785EPX"
+
+#~ msgid "EPSON CL-700"
+#~ msgstr "EPSON CL-700"
+
+#~ msgid "EPSON CL-750"
+#~ msgstr "EPSON CL-750"
+
+#~ msgid "EPSON CL-760"
+#~ msgstr "EPSON CL-760"
+
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "EPSON EM-900C"
+
+#~ msgid "EPSON MC-2000"
+#~ msgstr "EPSON MC-2000"
+
+#~ msgid "EPSON MC-7000"
+#~ msgstr "EPSON MC-7000"
+
+#~ msgid "EPSON MC-10000"
+#~ msgstr "EPSON MC-10000"
+
+#~ msgid "EPSON MJ-6000C"
+#~ msgstr "EPSON MJ-6000C"
+
+#~ msgid "HP DeskJet 600/600C"
+#~ msgstr "HP DeskJet 600/600C"
+
+#~ msgid "HP DeskJet 600 series"
+#~ msgstr "HP DeskJet 600 series"
+
+#~ msgid "HP DeskJet 690 series"
+#~ msgstr "HP DeskJet 690 series"
+
+#~ msgid "HP DeskJet 900 series"
+#~ msgstr "HP DeskJet 900 series"
+
+#~ msgid "HP DeskJet 2000 series"
+#~ msgstr "HP DeskJet 2000 series"
+
+#~ msgid "HP DeskJet 2500 series"
+#~ msgstr "HP DeskJet 2500 series"
+
+#~ msgid "HP LaserJet II series"
+#~ msgstr "HP LaserJet II series"
+
+#~ msgid "HP LaserJet III series"
+#~ msgstr "HP LaserJet III series"
+
+#~ msgid "HP LaserJet 4 series"
+#~ msgstr "HP LaserJet 4 series"
+
+#~ msgid "HP LaserJet 5 series"
+#~ msgstr "HP LaserJet 5 series"
+
+#~ msgid "HP LaserJet 6 series"
+#~ msgstr "HP LaserJet 6 series"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "This printer does not support raw printer output at depth %d\n"
+
+#, fuzzy
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "Cannot parse output from printer\n"
 
diff --git a/po/es.gmo b/po/es.gmo
index 3f65635..52d9a66 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 582c99b..f131422 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-04-29 00:38GMT\n"
 "Last-Translator: Gustavo D. Vranjes <gvranjes@abaconet.com.ar>\n"
 "Language-Team: Castellano <es@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Generator: KBabel 1.0beta1\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -79,12 +79,12 @@ msgstr ""
 msgid "Density"
 msgstr "Densidad:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -149,207 +149,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 PPP"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 PPP"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 PPP"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 PPP MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 PPP"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 PPP"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 PPP"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 PPP"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 PPP"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparencias"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Película para Imprimir por Atrás"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Hojas de Tela"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Sobre"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Papel de Alta Resolución"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Transferencias a Remeras"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Película de Alto Brillo"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Papel Brillante de Fotografía"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Tarjetas Brillantes de Fotografía"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Papel de Fotografía Profesional"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -357,16 +357,16 @@ msgstr "Papel de Fotografía Profesional"
 msgid "Other"
 msgstr "Otro"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamaño"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -383,57 +383,57 @@ msgstr "Tamaño"
 msgid "Basic Printer Setup"
 msgstr "Configuración de la Impresora"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamaño del papel al que desea imprimir"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -442,21 +442,21 @@ msgstr "Tipo de Tinta"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 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:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -466,14 +466,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -483,168 +483,169 @@ msgstr "Modelo de Impresora:"
 msgid "Core Parameter"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Autoalimentador de Hojas"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manual con Pausa"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manual sin Pausa"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Papel Opaco"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Negro"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Color CcMmYK para Fotografía"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "Color CMY (Cian/Mag/Amar)"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Color CcMmY para Fotografía"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "Color CMYK (Cian/Mag/Amar/Negro)"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Color CcMmY para Fotografía"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "Color CMY (Cian/Mag/Amar)"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Color CcMmYK para Fotografía"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Negro"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -847,14 +848,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cian"
 
@@ -863,14 +865,15 @@ 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/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -879,14 +882,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -895,10 +899,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/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -917,10 +921,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1164,233 +1168,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, 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:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "La medida de la imagen no es válida\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Estándar"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manual"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manual"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Bandeja"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel para Fotografía"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografía"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Opaco"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Negro"
@@ -1578,138 +1609,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 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:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1795,70 +1826,70 @@ msgstr "Fotografía de Seis Colores"
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Película Brillante"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1869,8 +1900,8 @@ msgstr "Papel Pesado Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2293,62 +2324,88 @@ msgstr "1440 x 360 PPP Altísima Calidad "
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 PPP"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 360 PPP Altísima Calidad "
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 PPP Altísima Calidad "
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 360 PPP Altísima Calidad "
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 PPP Altísima Calidad "
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
@@ -2436,7 +2493,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel Epson 4x6 de Fotografía"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2941,1526 +2999,3240 @@ msgid "Wide Postcard"
 msgstr "Postal"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "Rollo de Papel de 89 mm"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "Rollo de Papel de 5 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "Rollo de Papel de 210 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "Rollo de Papel de 22 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "Rollo de Papel de 24 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "Rollo de Papel de 44 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Definir Nueva Impresora"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Definir Nueva Impresora"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Definir Nueva Impresora"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Definir Nueva Impresora"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Nombre de la Impresora:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Configuración de la Impresora"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5169,79 +6941,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de salida:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bandeja 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bandeja 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bandeja 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bandeja 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "prueba de impresión"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Spanish"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5250,9 +7022,10 @@ msgstr ""
 "Éste es software libre, y usted es bienvenido a redistribuirlo bajo\n"
 "ciertas condiciones; tipee 'escputil -l' para más detalles.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5283,11 +7056,12 @@ msgstr ""
 "junto con éste programa; si no, escriba a la Fundación de Software\n"
 "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5325,6 +7099,8 @@ msgid ""
 "    -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 ""
 "Uso: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo]\n"
@@ -5372,12 +7148,13 @@ msgstr ""
 "    -m|--model         Especificar el modelo preciso de impresora para\n"
 "\t\t\talineación de cabezal.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5412,6 +7189,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Uso: escputil [OPCIONES] [COMANDO]\n"
 "Uso: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5457,74 +7236,84 @@ msgstr ""
 "    -m Especificar el modelo preciso de impresora para\n"
 "\t alineación de cabezal.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Opción desconocida %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "No puedo abrir dispositivo %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "No puedo enviar comando a impresora\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "No puedo leer %s de: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5533,15 +7322,7 @@ msgstr ""
 "\n"
 "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5552,87 +7333,229 @@ msgstr ""
 "No puedo detectar el tipo de impresora.\n"
 "Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+msgid "Status: Waiting\n"
+msgstr "Saturación:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Error en entrada\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Error en entrada\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
 msgstr ""
-"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Color de tinta"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "La impresora no soporta salida de color\n"
+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:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpiando inyectores...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que "
 "haya papel en la impresora.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5711,7 +7634,7 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5783,12 +7706,17 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "No puedo enviar comando a la impresora, saliendo.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5807,13 +7735,13 @@ msgstr ""
 "Luego le será requerido confirmar su elección.\n"
 "¿Qué opción elige? (s), (q), (r).\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5821,7 +7749,7 @@ msgstr ""
 "Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
 "guardar:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5830,7 +7758,7 @@ msgstr ""
 "Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
 "Si quiere guardar la alineación, deberá repetir éste proceso.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5839,12 +7767,12 @@ msgstr ""
 "Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
 "proceso de alineado:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5859,17 +7787,17 @@ msgstr ""
 "Favor de confirmar que desea guardar la configuración de su impresora\n"
 "tipeando 's' de nuevo.\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Acerca de guardar configuración..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "¡falló!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5878,27 +7806,27 @@ msgstr ""
 "Su configuración no fue guardada exitosamente. Debe repetir el\n"
 "proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "¡éxito!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Su configuración de alineación fue guardada a la impresora.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando no reconocido.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "El comando final no fue confirmado.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5915,12 +7843,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:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Presione enter para continuar > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5931,42 +7859,42 @@ msgstr ""
 "patrón.\n"
 "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Pasar #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, 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:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "¡Número fuera de rango!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Intentando definir alineación..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "éxito.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5979,7 +7907,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Error en entrada\n"
@@ -5988,11 +7916,11 @@ msgstr "Error en entrada\n"
 msgid "Printing..."
 msgstr "Imprimiendo..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Archivo/Imprimir..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -6004,502 +7932,568 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Mal espacio de color: bps %d canales %d espacio %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Sin buffer de filas\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "No puedo analizar el parámetro %s=%s (se espera un número)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "La impresora debe ser especificada con -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "La impresora %s no es un modelo conocido\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Traer próxima fila falló en %d\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "Traer próxima fila falló en %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "falló image_init %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "No puedo abrir el descriptor de archivo: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "No puedo abrir %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "¡Parámetros malos, no puedo continuar!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "No puedo analizar salida de la impresora\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Ajusta el balance amarillo de la impresión"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr ""
-#~ "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Ajusta el balance amarillo de la impresión"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó "
-#~ "sino\n"
-#~ "la opción -m debe ser usada para especificar una impresora.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Intentando detectar el modelo de impresora..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "No puedo abrir %s como lectura/escritura: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "El modelo de impresora %s es desconocido.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Acerca de Gimp-Print..."
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Establecer el brillo de la impresión.\n"
-#~ "0 es negro sólido, 2 es blanco sólido"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor "
-#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión "
-#~ "puede fallar!"
-
-#~ msgid "PPD File?"
-#~ msgstr "¿Archivo PPD?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: la opción `%s' es ambigua\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `--%s' no permite un argumento\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `%c%s' no permite un argumento\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: la opción `%s' requiere un argumento\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opción `--%s' desconocida\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opción `%c%s' desconocida\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opción no permitida -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opción no válida -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: la opción requiere un argumento -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: la opción `-W %s' es ambigua\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `-W %s' no permite un argumento\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Brillo:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Redimensionar la impresión al tamaño de la página"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Alimentación por Rollo"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 PPP Unidireccional"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f of %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimizar la salida para el tipo de imagen a imprimir"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Colores sólidos"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "La impresora no soporta salida de color\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "No puedo analizar salida de la impresora\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Ajusta el balance amarillo de la impresión"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr ""
+#~ "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Ajusta el balance amarillo de la impresión"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó "
+#~ "sino\n"
+#~ "la opción -m debe ser usada para especificar una impresora.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Intentando detectar el modelo de impresora..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "No puedo abrir %s como lectura/escritura: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "El modelo de impresora %s es desconocido.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Acerca de Gimp-Print..."
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "Establecer el brillo de la impresión.\n"
+#~ "0 es negro sólido, 2 es blanco sólido"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor "
+#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión "
+#~ "puede fallar!"
+
+#~ msgid "PPD File?"
+#~ msgstr "¿Archivo PPD?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: la opción `%s' es ambigua\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `--%s' no permite un argumento\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `%c%s' no permite un argumento\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: la opción `%s' requiere un argumento\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: opción `--%s' desconocida\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: opción `%c%s' desconocida\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción no permitida -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: opción no válida -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: la opción requiere un argumento -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: la opción `-W %s' es ambigua\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: la opción `-W %s' no permite un argumento\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Brillo:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Redimensionar la impresión al tamaño de la página"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Alimentación por Rollo"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 PPP Unidireccional"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f of %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "Optimizar la salida para el tipo de imagen a imprimir"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Colores sólidos"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index bf6dc07..c5da61c 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index eca894d..61d9791 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,17 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.1-pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
-"PO-Revision-Date: 2002-09-15 16:07+0200\n"
-"Last-Translator: Raymond Ostertag <r.ostertag@caramail.com>\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"PO-Revision-Date: 2006-05-13 21:08-0400\n"
+"Last-Translator: Olivier Poulet <opoulet@hispeed-sr.ch>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
-#, fuzzy
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr "Valeurs par défaut"
 
@@ -52,7 +51,7 @@ msgstr ""
 
 #: src/main/dither-main.c:64
 msgid "Adaptive Hybrid"
-msgstr "Adaptatif hybride"
+msgstr "Adaptatif Hybride"
 
 #: src/main/dither-main.c:65
 msgid "Ordered"
@@ -68,23 +67,22 @@ msgstr "Très rapide"
 
 #: src/main/dither-main.c:68
 msgid "Hybrid Floyd-Steinberg"
-msgstr "Floyd-Steinberg hybride"
+msgstr "Floyd-Steinberg Hybride"
 
 #: src/main/dither-main.c:69
 msgid "Predithered Input"
 msgstr ""
 
 #: src/main/dither-main.c:89 src/main/print-color.c:56
-#, fuzzy
 msgid "Density"
-msgstr "Densité :"
-
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+msgstr "Densité"
+
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -113,7 +111,6 @@ msgid "Screening Adjustment"
 msgstr ""
 
 #: src/main/dither-main.c:99
-#, fuzzy
 msgid ""
 "Choose the dither algorithm to be used.\n"
 "Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -125,16 +122,19 @@ msgid ""
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
 "Choisissez l'algorithme de tramage à utiliser.\n"
-"Adaptative Hybride produit habituellement la meilleure qualité de tous.\n"
-"Ordonné est plus rapide et produit une qualité presque aussi bonne que les "
-"photographes.\n"
-"Rapide et Très Rapide sont considérablement rapudes et fonctionne bien pour "
-"du text ou des tracés.\n"
+"Adaptatif Hybride produit habituellement la meilleure qualité de tous.\n"
+"EvenTone est un nouvel algorithme expérimental qui produit souvent "
+"d'excellents résultats.\n"
+"Ordonné est plus rapide et produit une qualité presque aussi bonne pour les "
+"photographies.\n"
+"Rapide et Très Rapide sont considérablement nettement plus rapides et "
+"fonctionnent\n"
+"bien pour du texte ou des tracés.\n"
 "Floyd-Steinberg Hybride produit généralement des sorties inférieures."
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
-msgstr ""
+msgstr "Divers (non classifiés)"
 
 #: src/main/module.c:53
 msgid "Family driver"
@@ -142,214 +142,188 @@ msgstr ""
 
 #: src/main/module.c:54
 msgid "Color conversion module"
-msgstr ""
+msgstr "Module de conversion couleur"
 
 #: src/main/module.c:55
 #, fuzzy
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: src/main/print-canon.c:1367
-#, fuzzy
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI"
-msgstr "600 ppp"
+msgstr "90x90 ppp"
 
-#: src/main/print-canon.c:1367
-#, fuzzy
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI DMT"
-msgstr "600 ppp"
+msgstr "90x90 ppp DMT"
 
-#: src/main/print-canon.c:1368
-#, fuzzy
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI"
-msgstr "150 x 150 ppp"
+msgstr "180x180 ppp"
 
-#: src/main/print-canon.c:1368
-#, fuzzy
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI DMT"
-msgstr "150 x 150 ppp"
+msgstr "180x180 ppp DMT"
 
-#: src/main/print-canon.c:1369
-#, fuzzy
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI"
-msgstr "300 x 300 ppp"
+msgstr "360x360 ppp"
 
-#: src/main/print-canon.c:1369
-#, fuzzy
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI DMT"
-msgstr "600 x 600 ppp"
+msgstr "360x360 ppp DMT"
 
-#: src/main/print-canon.c:1370
-#, fuzzy
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI"
-msgstr "720 x 360 ppp"
+msgstr "720x360 ppp"
 
-#: src/main/print-canon.c:1370
-#, fuzzy
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI DMT"
-msgstr "720 x 360 ppp MW2"
+msgstr "720x360 ppp DMT"
 
-#: src/main/print-canon.c:1371
-#, fuzzy
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI"
-msgstr "2880 x 720 ppp"
+msgstr "720x720 ppp"
 
-#: src/main/print-canon.c:1371
-#, fuzzy
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI DMT"
-msgstr "2880 x 720 ppp"
+msgstr "720x720 ppp DMT"
 
-#: src/main/print-canon.c:1372
-#, fuzzy
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI"
-msgstr "1440 x 720 ppp"
+msgstr "1440x720 ppp"
 
-#: src/main/print-canon.c:1372
-#, fuzzy
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 ppp"
+msgstr "1440x720 ppp DMT"
 
-#: src/main/print-canon.c:1373
-#, fuzzy
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI"
-msgstr "1440 x 1440 ppp"
+msgstr "1440x1440 ppp"
 
-#: src/main/print-canon.c:1373
-#, fuzzy
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 ppp"
+msgstr "1440x1440 ppp DMT"
 
-#: src/main/print-canon.c:1374
-#, fuzzy
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI"
-msgstr "2880 x 720 ppp"
+msgstr "2880x2880 ppp"
 
-#: src/main/print-canon.c:1374
-#, fuzzy
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 ppp"
+msgstr "2880x2880 ppp DMT"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150 x 150 ppp"
 
-#: src/main/print-canon.c:1375
-#, fuzzy
+#: src/main/print-canon.c:1390
 msgid "150x150 DPI DMT"
-msgstr "150 x 150 ppp"
+msgstr "150x150 ppp DMT"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300 x 300 ppp"
 
-#: src/main/print-canon.c:1376
-#, fuzzy
+#: src/main/print-canon.c:1391
 msgid "300x300 DPI DMT"
-msgstr "300 x 300 ppp"
+msgstr "300x300 ppp DMT"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600 x 300 ppp"
 
-#: src/main/print-canon.c:1377
-#, fuzzy
+#: src/main/print-canon.c:1392
 msgid "600x300 DPI DMT"
-msgstr "600 x 300 ppp"
+msgstr "600x300 ppp DMT"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600 x 600 ppp"
 
-#: src/main/print-canon.c:1378
-#, fuzzy
+#: src/main/print-canon.c:1393
 msgid "600x600 DPI DMT"
-msgstr "600 x 600 ppp"
+msgstr "600x600 ppp DMT"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200 x 600 ppp"
 
-#: src/main/print-canon.c:1379
-#, fuzzy
+#: src/main/print-canon.c:1394
 msgid "1200x600 DPI DMT"
-msgstr "1200 x 600 ppp"
+msgstr "1200x600 ppp DMT"
 
-#: src/main/print-canon.c:1380
-#, fuzzy
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI"
-msgstr "1200 x 600 ppp"
+msgstr "1200x1200 ppp"
 
-#: src/main/print-canon.c:1380
-#, fuzzy
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI DMT"
-msgstr "1200 x 600 ppp"
+msgstr "1200x1200 ppp DMT"
 
-#: src/main/print-canon.c:1381
-#, fuzzy
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI"
-msgstr "2400 x 600 ppp"
+msgstr "2400x2400 ppp"
 
-#: src/main/print-canon.c:1381
-#, fuzzy
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI DMT"
-msgstr "2400 x 600 ppp"
+msgstr "2400x2400 ppp DMT"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Papier normal"
 
-#: src/main/print-canon.c:1433
-#, fuzzy
+#: src/main/print-canon.c:1448
 msgid "Plain Paper PIXMA"
-msgstr "Papier normal"
+msgstr "Papier normal PIXMA"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparents"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Film back print"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Feuilles de fabrique"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Enveloppe"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Papier haute résolution"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Transferts T-Shirt"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Film glacé"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Cartes glacées qualité photo"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Papier photo pro"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -357,16 +331,15 @@ msgstr "Papier photo pro"
 msgid "Other"
 msgstr "Autre"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
-#, fuzzy
 msgid "Page Size"
-msgstr "Taille"
+msgstr "Taille de page"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -379,84 +352,81 @@ msgstr "Taille"
 #: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
 #: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
 #: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
-#, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Paramètres de l'imprimante"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
-#, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Taille du papier sur lequel vous souhaitez imprimer"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Type de support"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr ""
+msgstr "Type de média (papier normal, papier photo, etc.)"
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Source du support"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
-#, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Résolution et qualité de l'impression"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
 #: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
-msgstr ""
+msgstr "Configuration d'imprimante avancée"
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type d'encre dans l'imprimante"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,16 +434,15 @@ msgstr ""
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:314
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
 msgid "Advanced Printer Functionality"
-msgstr ""
+msgstr "Fonctionalités avancées de l'imprimante"
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
-#, fuzzy
 msgid "Printing Mode"
-msgstr "Modèle d'imprimante :"
+msgstr "Mode d'impression:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -483,181 +452,169 @@ msgstr "Modèle d'imprimante :"
 msgid "Core Parameter"
 msgstr "Papier normal"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#, fuzzy
 msgid "Double-Sided Printing"
-msgstr ""
+msgstr "Impression Recto-Verso"
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
-#, fuzzy
 msgid "Cyan Density"
-msgstr "Densité :"
+msgstr "Densité Cyan"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
-#, fuzzy
 msgid "Adjust the cyan density"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuster la densité de cyan"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
-#, fuzzy
 msgid "Magenta Density"
-msgstr "Magenta"
+msgstr "Densité Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
-#, fuzzy
 msgid "Adjust the magenta density"
-msgstr "Ajuste le niveau de majenta de l'impression"
+msgstr "Ajuster la densité de magenta"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
-#, fuzzy
 msgid "Yellow Density"
-msgstr "Densité :"
+msgstr "Densité Jaune"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
-#, fuzzy
 msgid "Adjust the yellow density"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Ajuster la densité de jaune"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
-#, fuzzy
 msgid "Black Density"
-msgstr "Densité :"
+msgstr "Densité Noir"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
-#, fuzzy
 msgid "Adjust the black density"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuster la densité de noir"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
-#, fuzzy
 msgid "Light Cyan Transition"
-msgstr "Cyan clair"
-
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+msgstr "Transition Cyan clair"
+
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
-#, fuzzy
 msgid "Light Magenta Transition"
-msgstr "Magenta clair"
+msgstr "Transition Magenta clair"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
-#, fuzzy
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
-msgstr "Cyan clair"
+msgstr "Transition Jaune clair"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
-msgstr ""
+msgstr "Désactivé"
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Insertion automatique"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manuel avec pause"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manuel sans pause"
 
-#: src/main/print-canon.c:1904
-#, fuzzy
+#: src/main/print-canon.c:1923
 msgid "Cassette"
-msgstr "Papier Mat"
+msgstr "Cassette"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Noir"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Photo couleur CcMmJN"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "Couleur CMJ"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Photo couleur CcMmJ"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "Couleur CMJN"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Photo couleur CcMmJ"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "Couleur CMJ"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Photo couleur CcMmJN"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Noir"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
-#, fuzzy
 msgid "Black and White"
 msgstr "Noir et blanc"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
-msgstr ""
+msgstr "Haute Précision"
 
 #: src/main/print-color.c:51
-#, fuzzy
 msgid "Bright Colors"
-msgstr "Ajustez les couleurs d'impression"
+msgstr "Couleurs vives"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -665,19 +622,19 @@ msgstr ""
 
 #: src/main/print-color.c:53
 msgid "Uncorrected"
-msgstr ""
+msgstr "Neutre"
 
 #: src/main/print-color.c:54
 msgid "Desaturated"
-msgstr ""
+msgstr "Désaturé"
 
 #: src/main/print-color.c:55
 msgid "Threshold"
-msgstr ""
+msgstr "Seuil"
 
 #: src/main/print-color.c:57 src/main/print-color.c:133
 msgid "Raw"
-msgstr ""
+msgstr "Brut"
 
 #: src/main/print-color.c:58
 #, fuzzy
@@ -697,29 +654,27 @@ msgstr "Jaune"
 
 #: src/main/print-color.c:125
 msgid "RGB"
-msgstr ""
+msgstr "RGB"
 
 #: src/main/print-color.c:127
 msgid "CMY"
-msgstr ""
+msgstr "CMY"
 
 #: src/main/print-color.c:129
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
 #: src/main/print-color.c:131
 msgid "KCMY"
-msgstr ""
+msgstr "KCMY"
 
 #: src/main/print-color.c:165 src/main/print-color.c:446
-#, fuzzy
 msgid "Channel "
-msgstr "Annuler"
+msgstr "Canal"
 
 #: src/main/print-color.c:165
-#, fuzzy
 msgid " Gamma"
-msgstr "Gamma :"
+msgstr " Gamma"
 
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
@@ -727,9 +682,8 @@ msgstr "Gamma :"
 #: src/main/print-color.c:282 src/main/print-color.c:290
 #: src/main/print-color.c:298 src/main/print-color.c:306
 #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
-#, fuzzy
 msgid "Gamma"
-msgstr "Gamma :"
+msgstr "Gamma"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
@@ -737,7 +691,7 @@ msgstr ""
 
 #: src/main/print-color.c:176
 msgid "Color Correction"
-msgstr ""
+msgstr "Correction couleur"
 
 #: src/main/print-color.c:176 src/main/print-color.c:224
 #: src/main/print-color.c:232 src/main/print-color.c:346
@@ -747,64 +701,60 @@ msgstr ""
 
 #: src/main/print-color.c:177
 msgid "Color correction to be applied"
-msgstr ""
+msgstr "Correction couleur à appliquer"
 
 #: src/main/print-color.c:184
+#, fuzzy
 msgid "Channel Bit Depth"
-msgstr ""
+msgstr "Profondeur de Canal en bits"
 
 #: src/main/print-color.c:185
+#, fuzzy
 msgid "Bit depth per channel"
-msgstr ""
+msgstr "Profondeur en bits par canal"
 
 #: src/main/print-color.c:192
-#, fuzzy
 msgid "Input Image Type"
-msgstr "Type d'image"
+msgstr "Type d'image en entrée"
 
 #: src/main/print-color.c:193
-#, fuzzy
 msgid "Input image type"
-msgstr "Type d'image"
+msgstr "Type d'image en entrée"
 
 #: src/main/print-color.c:200
-#, fuzzy
 msgid "Output Image Type"
-msgstr "Type de sortie :"
+msgstr "Type d'image en sortie"
 
 #: src/main/print-color.c:201
-#, fuzzy
 msgid "Output image type"
-msgstr "Type de sortie :"
+msgstr "Type d'image en sortie"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
+#, fuzzy
 msgid "Raw Channels"
-msgstr ""
+msgstr "Canaux bruts"
 
 #: src/main/print-color.c:216
 #, fuzzy
 msgid "SimpleGamma"
-msgstr "Gamma :"
+msgstr "Gamma"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
 msgstr ""
 
 #: src/main/print-color.c:224
-#, fuzzy
 msgid "Brightness"
-msgstr "Luminosité :"
+msgstr "Luminosité"
 
 #: src/main/print-color.c:225
-#, fuzzy
 msgid "Brightness of the print"
-msgstr "Défini la hauteur de l'impression"
+msgstr "Définit la luminosité de l'impression"
 
 #: src/main/print-color.c:232
-#, fuzzy
 msgid "Contrast"
-msgstr "Contraste :"
+msgstr "Contraste"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
@@ -812,12 +762,11 @@ msgstr ""
 
 #: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
-msgstr ""
+msgstr "Ajustement du Contraste Linéaire"
 
 #: src/main/print-color.c:240
-#, fuzzy
 msgid "Advanced Image Control"
-msgstr "Type de sortie :"
+msgstr "Contrôle d'image avancé"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -828,12 +777,11 @@ msgid "Composite Gamma"
 msgstr ""
 
 #: src/main/print-color.c:249
-#, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Ajustement de la Gamma de l'impression. De grandes valeurs vont généralement "
+"Ajustement du Gamma de l'impression. De grandes valeurs vont généralement "
 "produire une impression plus brillante,tandis que des petites valeurs vont "
 "généralement produire une impression plus sombre. Noir et Blanc vont rester "
 "identiques en fonction de l'ajustement du brillant."
@@ -841,98 +789,94 @@ msgstr ""
 #: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
-msgstr "Gamma :"
+msgstr "Gamma"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
 #: src/main/print-color.c:267
-#, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "Ajuste le niveau de cyan de l'impression"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+msgstr "Ajuster le gamma cyan"
+
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
 #: src/main/print-color.c:275
-#, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "Ajuste le niveau de majenta de l'impression"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+msgstr "Ajuster le gamma magenta"
+
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Jaune"
 
 #: src/main/print-color.c:283
-#, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Ajuster le gamma jaune"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
-msgstr ""
+msgstr "Rouge"
 
 #: src/main/print-color.c:291
-#, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Ajuster le gamma rouge"
 
 #: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
 #: src/gutenprintui2/panel.c:2158
 msgid "Green"
-msgstr ""
+msgstr "Vert"
 
 #: src/main/print-color.c:299
-#, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Ajuste le niveau de majenta de l'impression"
+msgstr "Ajuster le gamma vert"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
-msgstr ""
+msgstr "Bleu"
 
 #: src/main/print-color.c:307
-#, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuster le gamma bleu"
 
 #: src/main/print-color.c:315
-#, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuster le gamma noir"
 
 #: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
@@ -950,9 +894,8 @@ msgid "Adjust the cyan gray balance"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
 #: src/main/print-color.c:330 src/main/print-olympus.c:1338
-#, fuzzy
 msgid "Magenta Balance"
-msgstr "Magenta"
+msgstr "Balance Magenta"
 
 #: src/main/print-color.c:331
 #, fuzzy
@@ -960,9 +903,8 @@ msgid "Adjust the magenta gray balance"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
 #: src/main/print-color.c:338 src/main/print-olympus.c:1346
-#, fuzzy
 msgid "Yellow Balance"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Balance Jaune"
 
 #: src/main/print-color.c:339
 #, fuzzy
@@ -970,9 +912,8 @@ msgid "Adjust the yellow gray balance"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
 #: src/main/print-color.c:346
-#, fuzzy
 msgid "Saturation"
-msgstr "Saturation :"
+msgstr "Saturation"
 
 #: src/main/print-color.c:347
 msgid ""
@@ -995,7 +936,7 @@ msgstr "Type d'encre"
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "Type de sortie :"
+msgstr "Type de sortie"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
@@ -1026,18 +967,16 @@ msgid "Upper bound of gray component reduction"
 msgstr ""
 
 #: src/main/print-color.c:446
-#, fuzzy
 msgid " Curve"
-msgstr "Noir"
+msgstr "Courbe"
 
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
 #: src/main/print-color.c:497 src/main/print-color.c:505
 #: src/main/print-color.c:513
-#, fuzzy
 msgid "Output Curves"
-msgstr "Type de sortie :"
+msgstr "Courbes de sortie"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
@@ -1045,82 +984,67 @@ msgstr ""
 
 #: src/main/print-color.c:457
 msgid "Cyan Curve"
-msgstr ""
+msgstr "Courbe Cyan"
 
 #: src/main/print-color.c:458
-#, fuzzy
 msgid "Cyan curve"
-msgstr "Annuler"
+msgstr "Courbe Cyan"
 
 #: src/main/print-color.c:465
-#, fuzzy
 msgid "Magenta Curve"
-msgstr "Magenta"
+msgstr "Courbe Magenta"
 
 #: src/main/print-color.c:466
-#, fuzzy
 msgid "Magenta curve"
-msgstr "Magenta"
+msgstr "Courbe Magenta"
 
 #: src/main/print-color.c:473
-#, fuzzy
 msgid "Yellow Curve"
-msgstr "Jaune"
+msgstr "Courbe Jaune"
 
 #: src/main/print-color.c:474
-#, fuzzy
 msgid "Yellow curve"
-msgstr "Jaune"
+msgstr "Courbe Jaune"
 
 #: src/main/print-color.c:481
-#, fuzzy
 msgid "Black Curve"
-msgstr "Noir"
+msgstr "Courbe Noir"
 
 #: src/main/print-color.c:482
-#, fuzzy
 msgid "Black curve"
-msgstr "Noir"
+msgstr "Courbe Noir"
 
 #: src/main/print-color.c:489
-#, fuzzy
 msgid "Red Curve"
-msgstr "Jaune"
+msgstr "Courbe Rouge"
 
 #: src/main/print-color.c:490
-#, fuzzy
 msgid "Red curve"
-msgstr "Jaune"
+msgstr "Courbe Rouge"
 
 #: src/main/print-color.c:497
-#, fuzzy
 msgid "Green Curve"
-msgstr "Magenta"
+msgstr "Courbe Verte"
 
 #: src/main/print-color.c:498
-#, fuzzy
 msgid "Green curve"
-msgstr "Magenta"
+msgstr "Courbe Verte"
 
 #: src/main/print-color.c:505
-#, fuzzy
 msgid "Blue Curve"
-msgstr "Noir"
+msgstr "Courbe Bleu"
 
 #: src/main/print-color.c:506
-#, fuzzy
 msgid "Blue curve"
-msgstr "Noir"
+msgstr "Courbe Bleu"
 
 #: src/main/print-color.c:513
-#, fuzzy
 msgid "White Curve"
-msgstr "Jaune"
+msgstr "Courbe Blanc"
 
 #: src/main/print-color.c:514
-#, fuzzy
 msgid "White curve"
-msgstr "Jaune"
+msgstr "Courbe Blanc"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
@@ -1138,11 +1062,11 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "Saturation :"
+msgstr "Saturation"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
-msgstr ""
+msgstr "Courbe d'ajustement de la Saturation"
 
 #: src/main/print-color.c:537
 msgid "Luminosity Map"
@@ -1164,240 +1088,257 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s n'est pas un paramètre valide de type %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
-msgstr ""
+msgstr "%s doit être entre %f et %f (actuellement %f)\n"
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
-msgstr ""
+msgstr "%s doit être entre %d et %d (actuellemtn %d)\n"
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
-msgstr ""
+msgstr "%s bounds must be between %f and %f\n"
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Imprimante inconnue %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
-#, fuzzy
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
-msgstr "La taille d'image n'est pas valide\n"
+msgstr "La taille de page n'est pas valide\n"
 
-#: src/main/printers.c:732
-#, fuzzy, c-format
+#: src/main/printers.c:776
+#, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "La marge haute ne doit pas être moins que zéro\n"
+msgstr "La marge supérieure ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:738
-#, fuzzy, c-format
+#: src/main/printers.c:782
+#, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "La marge gauche ne doit pas être moins que zéro\n"
+msgstr "La marge gauche ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:744
-#, fuzzy
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
-msgstr "La marge gauche ne doit pas être moins que zéro\n"
+msgstr "La hauteur doit être supérieure à zéro\n"
 
-#: src/main/printers.c:750
-#, fuzzy
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
-msgstr "La marge haute ne doit pas être moins que zéro\n"
+msgstr "La largeur doit être supérieure à zéro\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
+"L'image est trop large pour la page: marge gauche: %d, largeur: %d, bord "
+"droit: %d\n"
 
-#: src/main/printers.c:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
+"L'image est trop longue pour la page: marge supérieure: %d, hauteur: %d, "
+"bord inférieur: %d\n"
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
-#, fuzzy
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
-msgstr "Manuel"
+msgstr "Chargement Manuel"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
-#, fuzzy
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 msgid "Print to CD"
-msgstr "Imprimer dans un fichier ?"
+msgstr "Imprimer vers un CD"
+
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Sélection Manuelle"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Chargement Manuel"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Bac"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Noir photo"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection auto"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
-msgstr ""
+msgstr "Sélection Manuelle"
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
-msgstr ""
+msgstr "Économique Rapide"
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
-msgstr ""
+msgstr "Économique"
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
-#, fuzzy
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 msgid "High"
-msgstr "Hauteur :"
+msgstr "Haut"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
-#, fuzzy
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Photographie"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
-#, fuzzy
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 msgid "Super Photo"
-msgstr "Stylus Photo"
+msgstr "Photographie haute qualité"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six couleurs photo"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
-msgstr ""
+msgstr "Optimale"
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
-#, fuzzy
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
-#, fuzzy
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
-#, fuzzy
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 msgid "Light Black"
-msgstr "Noir"
+msgstr "Noir clair"
 
-#: src/main/print-escp2-data.c:690
-#, fuzzy
+#: src/main/print-escp2-data.c:810
 msgid "Dark Yellow"
-msgstr "Jaune"
+msgstr "Jaune Foncé"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
-#, fuzzy
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 msgid "Matte Black"
-msgstr "Papier Mat"
+msgstr "Noir mat"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
-#, fuzzy
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 msgid "Photo Black"
-msgstr "Papier photo"
+msgstr "Noir photo"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Film glacé"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Noir"
 
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
-msgstr ""
+msgstr "Mode d'impression automatique"
 
 #: src/main/print-escp2.c:159 src/main/print-escp2.c:171
 #: src/main/generic-options.c:62
@@ -1406,13 +1347,12 @@ msgstr ""
 
 #: src/main/print-escp2.c:160
 msgid "Automatic printing mode"
-msgstr ""
+msgstr "Mode d'impression automatique"
 
 #: src/main/print-escp2.c:171 src/main/print-escp2.c:172
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
 msgid "Print Quality"
-msgstr "720 ppp Trés haute qualité"
+msgstr "Qualité d'impression"
 
 #: src/main/print-escp2.c:195
 msgid "CD Hub Size"
@@ -1435,9 +1375,8 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-escp2.c:214
-#, fuzzy
 msgid "Resolution of the print"
-msgstr "Résolution et qualité de l'impression"
+msgstr "Résolution de l'impression"
 
 #: src/main/print-escp2.c:230
 msgid "Enhanced Gloss"
@@ -1448,13 +1387,12 @@ msgid "Add gloss enhancement"
 msgstr ""
 
 #: src/main/print-escp2.c:236
-#, fuzzy
 msgid "Ink Set"
 msgstr "Type d'encre"
 
 #: src/main/print-escp2.c:242
 msgid "Printing Direction"
-msgstr ""
+msgstr "Direction d'impression"
 
 #: src/main/print-escp2.c:242 src/main/print-escp2.c:254
 msgid "Advanced Output Adjustment"
@@ -1463,14 +1401,16 @@ msgstr ""
 #: src/main/print-escp2.c:243
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
+"Direction d'impression (unidirectionnel est de meilleure qualité, mais plus "
+"lent)"
 
 #: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
-msgstr ""
+msgstr "Impression sans bords"
 
 #: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
-msgstr ""
+msgstr "Imprimer sans bordures (pleine page)"
 
 #: src/main/print-escp2.c:254
 msgid "Interleave Method"
@@ -1482,16 +1422,16 @@ msgstr ""
 
 #: src/main/print-escp2.c:260
 msgid "Adjust dot size as necessary"
-msgstr ""
+msgstr "Ajuster la taille des gouttes"
 
 #: src/main/print-escp2.c:261
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
+"Ajuster la taille des gouttes si nécessaire pour atteindre la densité désirée"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#, fuzzy
 msgid "Output Order"
-msgstr "Type de sortie :"
+msgstr "Ordre sortie"
 
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
@@ -1502,9 +1442,8 @@ msgid "Alignment Choices"
 msgstr ""
 
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:285
-#, fuzzy
 msgid "Ink change command"
-msgstr "Commande non reconnue.\n"
+msgstr "Commande de changement d'encre"
 
 #: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
@@ -1521,9 +1460,8 @@ msgid "Supports Packet Mode"
 msgstr ""
 
 #: src/main/print-escp2.c:314 src/main/print-escp2.c:315
-#, fuzzy
 msgid "Channel Names"
-msgstr "Annuler"
+msgstr "Noms des canaux"
 
 #: src/main/print-escp2.c:327
 msgid "Raw Channel Count"
@@ -1562,12 +1500,12 @@ msgstr "Ajuste le niveau de jaune de l'impression"
 #: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Blue Map"
-msgstr "Noir et blanc"
+msgstr "Bleu"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuste le niveau de bleu de l'impression"
 
 #: src/main/print-escp2.c:356
 msgid "Red Map"
@@ -1578,141 +1516,128 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-escp2.c:444
-#, fuzzy
+#: src/main/print-escp2.c:445
 msgid "Red Density"
-msgstr "Densité :"
+msgstr "Densité Rouge"
 
-#: src/main/print-escp2.c:445
-#, fuzzy
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Ajuster la densité du rouge"
 
-#: src/main/print-escp2.c:452
-#, fuzzy
+#: src/main/print-escp2.c:453
 msgid "Blue Density"
-msgstr "Densité :"
+msgstr "Densité Bleu"
 
-#: src/main/print-escp2.c:453
-#, fuzzy
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Ajuster la densité du bleu"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Film glacé"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Ajuste le niveau de brillance de l'impression"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
-msgstr ""
+msgstr "Transition Jaune Foncé"
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
-msgstr ""
+msgstr "Transition Gris"
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
-#, fuzzy
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
-msgstr "Cyan clair"
+msgstr "Transition Gris Clair"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
-#, fuzzy
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
-msgstr "Cyan clair"
+msgstr "Transition Gris Foncé"
 
-#: src/main/print-escp2.c:516
-#, fuzzy
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
-msgstr "Cyan clair"
+msgstr "Transition Gris Médian"
 
-#: src/main/print-escp2.c:517
-#, fuzzy
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
-msgstr "Cyan clair"
+msgstr "Transition Gris Moyen"
 
-#: src/main/print-escp2.c:1443
-#, fuzzy
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
-msgstr "Type de sortie :"
+msgstr "Contrôle manuel complêt"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
-msgstr ""
+msgstr "CD - 5 pouces"
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
-msgstr ""
+msgstr "CD - 3 pouces"
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
-#, fuzzy
 msgid "Manual Control"
-msgstr "Type de sortie :"
+msgstr "Contrôle manuel"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
-#, fuzzy
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 msgid "Automatic"
-msgstr "Taille"
+msgstr "Automatique"
 
-#: src/main/print-escp2.c:1619
-#, fuzzy
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
-msgstr "600 ppp Unirectionnel"
+msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:1621
-#, fuzzy
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
-msgstr "600 ppp Unirectionnel"
+msgstr "Unidirectionnel"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
-msgstr ""
+msgstr "Options d'impression non vérifiées; ne peux imprimer.\n"
 
 #: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
 msgid "300 DPI x 600 DPI"
@@ -1795,70 +1720,70 @@ msgstr "Six couleurs photo"
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Film glacé"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1869,10 +1794,10 @@ msgstr "Papier épais Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #: src/main/print-olympus.c:859
 #, fuzzy
@@ -2006,15 +1931,13 @@ msgid "Long Edge (Standard)"
 msgstr ""
 
 #: src/main/print-ps.c:96
-#, fuzzy
 msgid "PPDFile"
-msgstr "Fichier PPD :"
+msgstr "Fichier PPD"
 
 #: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
 #: src/gutenprintui2/panel.c:1749
-#, fuzzy
 msgid "PPD File"
-msgstr "Fichier PPD ?"
+msgstr "Fichier PPD"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
@@ -2051,9 +1974,8 @@ msgid "Seven Color Enhanced"
 msgstr "Sept couleurs amélioré"
 
 #: src/main/escp2-channels.c:1535
-#, fuzzy
 msgid "Eight Color Photo"
-msgstr "Six couleurs photo"
+msgstr "Photo huit couleurs"
 
 #: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
@@ -2103,9 +2025,8 @@ msgstr "Photo sept couleurs"
 
 #: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
 #: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
-#, fuzzy
 msgid "Six Color Raw"
-msgstr "Six couleurs photo"
+msgstr "Six couleurs brut"
 
 #: src/main/escp2-channels.c:1962
 #, fuzzy
@@ -2114,9 +2035,8 @@ msgstr "Six couleurs amélioré composite"
 
 #: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
 #: src/main/escp2-channels.c:2007
-#, fuzzy
 msgid "Seven Color Raw"
-msgstr "Photo sept couleurs"
+msgstr "Sept couleurs brut"
 
 #: src/main/escp2-channels.c:2024
 #, fuzzy
@@ -2124,9 +2044,8 @@ msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs amélioré"
 
 #: src/main/escp2-channels.c:2042
-#, fuzzy
 msgid "Eight Color Raw"
-msgstr "Six couleurs photo"
+msgstr "Huit couleurs brut"
 
 #: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
 #: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -2136,16 +2055,15 @@ msgstr "Six couleurs photo"
 #: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
 #: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
-msgstr ""
+msgstr "Encres EPSON Standard"
 
 #: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
-#, fuzzy
 msgid "UltraChrome Photo Black"
-msgstr "Six couleurs photo"
+msgstr "Noir Photo UltraChrome"
 
 #: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
-msgstr ""
+msgstr "Noir Mat UltraChrome"
 
 #: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
 #: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
@@ -2176,22 +2094,19 @@ msgstr "Papier Mat"
 #: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
 #: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
 #: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
-#, fuzzy
 msgid "Premium Semigloss Photo Paper"
-msgstr "Papier glacé photo Premium"
+msgstr "Papier semi-glacé photo Premium"
 
 #: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
 #: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
 #: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
-#, fuzzy
 msgid "ColorLife Paper"
-msgstr "Papier normal"
+msgstr "Papier ColorLife"
 
 #: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
 #: src/main/escp2-papers.c:1418
-#, fuzzy
 msgid "Archival Matte Paper"
-msgstr "Papier Mat"
+msgstr "Papier Mat pour Archivage"
 
 #: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
 #: src/main/escp2-papers.c:1420
@@ -2200,169 +2115,173 @@ msgstr ""
 
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
-msgstr ""
+msgstr "360 x 90 DPI Fast Economy"
 
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600 x 600 ppp Monochrome"
+msgstr "360 x 120 ppp Économique"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
-msgstr ""
+msgstr "180 ppp Économique"
 
 #: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-#, fuzzy
 msgid "360 x 180 DPI Draft"
-msgstr "150 x 150 ppp"
+msgstr "360 x 180 ppp Brouillon"
 
 #: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
 msgid "360 x 240 DPI Draft"
-msgstr "600 x 600 ppp"
+msgstr "360 x 240 ppp Brouillon"
 
 #: src/main/escp2-resolutions.c:68
-#, fuzzy
 msgid "360 DPI High Quality"
-msgstr "1440 x 360 ppp Haute qualité"
+msgstr "360 ppp Haute qualité"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
-#, fuzzy
 msgid "360 DPI"
-msgstr "600 ppp"
+msgstr "360 ppp"
 
 #: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
-#, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 ppp"
 
 #: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
-#, fuzzy
 msgid "720 DPI"
-msgstr "1200 ppp"
+msgstr "720 ppp"
 
 #: src/main/escp2-resolutions.c:94
-#, fuzzy
 msgid "720 DPI High Quality"
-msgstr "1200 ppp Haute qualité"
+msgstr "720 ppp Haute qualité"
 
 #: src/main/escp2-resolutions.c:97
-#, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 ppp Très haute qualité"
+msgstr "720 ppp Très haute qualité"
 
 #: src/main/escp2-resolutions.c:100
-#, fuzzy
 msgid "720 x 720 DPI"
-msgstr "2880 x 720 ppp"
+msgstr "720 x 720 ppp"
 
 #: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
 #: src/main/escp2-resolutions.c:119
-#, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
 #: src/main/escp2-resolutions.c:110
-#, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 360 ppp Trés haute qualité"
+msgstr "1440 x 720 ppp Très haute qualité"
 
 #: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 ppp"
+msgstr "1440 x 720 ppp Transposé"
 
 #: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
-#, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
 #: src/main/escp2-resolutions.c:129
-#, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 x 360 ppp Trés haute qualité"
+msgstr "2880 x 720 ppp Très haute qualité"
 
 #: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
 #: src/main/escp2-resolutions.c:139
-#, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
 #, fuzzy
-msgid "2880 x 1440 DPI"
+msgid "1440 x 1440"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "2880 x 720 ppp Très haute qualité"
+
+#: src/main/escp2-resolutions.c:148
 #, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 720 ppp Très haute qualité"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
+msgid "2880 x 1440 DPI"
+msgstr "2880 x 1440 ppp"
+
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 ppp"
+msgstr "2880 x 1440 ppp Transposé"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
 #, fuzzy
-msgid "5760 x 1440 DPI"
-msgstr "1440 x 1440 ppp"
+msgid "2880 x 1440 DPI High Quality"
+msgstr "2880 x 720 ppp Très haute qualité"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:167
 #, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "2880 x 720 ppp Très haute qualité"
+
+#: src/main/escp2-resolutions.c:171
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 ppp"
+
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 msgid "2880 x 2880 DPI"
-msgstr "2880 x 720 ppp"
+msgstr "2880 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
-#, fuzzy
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 ppp"
+msgstr "5760 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
-msgstr ""
+msgstr "Activé"
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Luminosité :"
 
 #: src/main/generic-options.c:46
 msgid "Text"
-msgstr ""
+msgstr "Texte"
 
 #: src/main/generic-options.c:47
 msgid "Graphics"
-msgstr ""
+msgstr "Graphiques"
 
 #: src/main/generic-options.c:48
 msgid "Mixed Text and Graphics"
-msgstr ""
+msgstr "Texte et Graphiques"
 
 #: src/main/generic-options.c:49
-#, fuzzy
 msgid "Photograph"
 msgstr "Photographie"
 
@@ -2371,23 +2290,20 @@ msgid "Line Art"
 msgstr "Crayon"
 
 #: src/main/generic-options.c:55
-#, fuzzy
 msgid "Page"
-msgstr "Taille"
+msgstr "Page"
 
 #: src/main/generic-options.c:56
 msgid "Job"
 msgstr ""
 
 #: src/main/generic-options.c:68
-#, fuzzy
 msgid "Image Type"
-msgstr "Type d'image :"
+msgstr "Type d'image"
 
 #: src/main/generic-options.c:69
-#, fuzzy
 msgid "Type of image being printed"
-msgstr "Type d'encre dans l'imprimante"
+msgstr "Type d'image à imprimer"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2398,14 +2314,12 @@ msgid "Job vs. page mode"
 msgstr ""
 
 #: src/main/generic-options.c:80
-#, fuzzy
 msgid "Page Number"
-msgstr "Taille"
+msgstr "Numéro de page"
 
 #: src/main/generic-options.c:81
-#, fuzzy
 msgid "Page number"
-msgstr "Taille"
+msgstr "Numéro de page"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2432,7 +2346,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papier photo Epson 4x6"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2488,9 +2403,8 @@ msgid "20x30"
 msgstr "20x30"
 
 #: src/main/xmli18n-tmp.h:25
-#, fuzzy
 msgid "22x30"
-msgstr "20x30"
+msgstr "22x30"
 
 #: src/main/xmli18n-tmp.h:26
 msgid "24x30"
@@ -2513,9 +2427,8 @@ msgid "2A"
 msgstr "2A"
 
 #: src/main/xmli18n-tmp.h:31
-#, fuzzy
 msgid "Super A0"
-msgstr "Stylus Photo"
+msgstr "Super A0"
 
 #: src/main/xmli18n-tmp.h:32
 msgid "A0"
@@ -2823,9 +2736,8 @@ msgid "Royal Quarto"
 msgstr "Quatro royal"
 
 #: src/main/xmli18n-tmp.h:108
-#, fuzzy
 msgid "ISO A4"
-msgstr "SRA4"
+msgstr "ISO A4"
 
 #: src/main/xmli18n-tmp.h:109
 msgid "Crown Octavo"
@@ -2845,7 +2757,7 @@ msgstr "Octave royale"
 
 #: src/main/xmli18n-tmp.h:113
 msgid "ISO A5"
-msgstr ""
+msgstr "ISO A5"
 
 #: src/main/xmli18n-tmp.h:114
 msgid "Small paperback"
@@ -2861,7 +2773,7 @@ msgstr "Grande reliure Penguin"
 
 #: src/main/xmli18n-tmp.h:117
 msgid "10cm x 15cm"
-msgstr ""
+msgstr "10cm x 15cm"
 
 #: src/main/xmli18n-tmp.h:118
 msgid "Hagaki Card"
@@ -2889,7 +2801,7 @@ msgstr "Commercial 10"
 
 #: src/main/xmli18n-tmp.h:124
 msgid "A2 Invitation"
-msgstr "A2 Invitation"
+msgstr "Invitation A2"
 
 #: src/main/xmli18n-tmp.h:125
 msgid "Monarch Envelope"
@@ -2900,9 +2812,8 @@ msgid "4x5 3/8"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:127
-#, fuzzy
 msgid "4x7"
-msgstr "5x7"
+msgstr "4x7"
 
 #: src/main/xmli18n-tmp.h:128
 msgid "CP_L"
@@ -2910,7 +2821,7 @@ msgstr ""
 
 #: src/main/xmli18n-tmp.h:129
 msgid "Card"
-msgstr ""
+msgstr "Carte"
 
 #: src/main/xmli18n-tmp.h:130
 #, fuzzy
@@ -2918,1526 +2829,3539 @@ msgid "Wide Postcard"
 msgstr "Carte postale"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "Rouleau 89mm"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "Rouleau 5 pouces"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "Rouleau 210mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "Rouleau 22 pouces"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "Rouleau 24 pouces"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "Rouleau 44 pouces"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
-msgstr ""
+msgid "PostScript Level 1"
+msgstr "PostScript Niveau 1"
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
-msgstr ""
+msgid "PostScript Level 2"
+msgstr "PostScript Niveau 2"
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
-msgstr ""
+#, fuzzy
+msgid "Canon BJ-30"
+msgstr "Canon BJC 30"
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-50"
+msgstr "Canon BJC 50"
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-55"
+msgstr "Canon BJC 55"
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-80"
+msgstr "Canon BJC 80"
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-85"
+msgstr "Canon BJC 85"
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-210"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-240"
+msgstr "Canon BJC 240"
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-250"
+msgstr "Canon BJC 250"
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-1000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-2010"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-2100"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-2110"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-3000"
+msgstr "Canon BJC 3000"
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-4000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-4300"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-4400"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-6000"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-6100"
+msgstr "Canon BJC 6100"
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-6200"
+msgstr "Canon BJC 6200"
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-6500"
+msgstr "Canon BJC 6500"
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-7100"
+msgstr "Canon BJC 7100"
 
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:170
 #, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:176
 #, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:177
 #, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:180
 #, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "EPSON Stylus C20"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "EPSON Stylus C20SX"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C40"
+msgstr "EPSON Stylus C40"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C40SX"
+msgstr "EPSON Stylus C40SX"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C40UX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "EPSON Stylus C41"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "EPSON Stylus C41SX"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "EPSON Stylus C42"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "EPSON Stylus C42SX"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "EPSON Stylus C43"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "EPSON Stylus C43SX"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "EPSON Stylus C44"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "EPSON Stylus C44SX"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "EPSON Stylus C45"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "EPSON Stylus C48"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "EPSON Stylus C63"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "EPSON Stylus C64"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "EPSON Stylus C65"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "EPSON Stylus C66"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "EPSON Stylus C68"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "EPSON Stylus C83"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "EPSON Stylus C84"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "EPSON Stylus C85"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "EPSON Stylus C86"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "EPSON Stylus C88"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "EPSON Stylus Photo EX3"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "EPSON Stylus Photo 825"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "EPSON Stylus Photo 935"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "EPSON Stylus Photo R210"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "EPSON Stylus Photo R220"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "EPSON Stylus Photo R310"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "EPSON Stylus Photo R320"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "EPSON Stylus Photo R340"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "EPSON Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "EPSON Stylus Photo RX420"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "EPSON Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "EPSON Stylus Photo RX430"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "EPSON Stylus Photo RX510"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "EPSON Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "EPSON Stylus Photo RX620"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "EPSON Stylus Photo RX630"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "EPSON Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "EPSON Stylus Photo R1800"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R2400"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "EPSON Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "EPSON Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3200"
+msgstr "EPSON Stylus CX3200"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3500"
+msgstr "EPSON Stylus CX3500"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3600"
+msgstr "EPSON Stylus CX3600"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3650"
+msgstr "EPSON Stylus CX3650"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3700"
+msgstr "EPSON Stylus CX3700"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3800"
+msgstr "EPSON Stylus CX3800"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "EPSON Stylus CX3805"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3810"
+msgstr "EPSON Stylus CX3810"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "EPSON Stylus CX4100"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX4200"
+msgstr "EPSON Stylus CX4200"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX4500"
+msgstr "EPSON Stylus CX4500"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX4600"
+msgstr "EPSON Stylus CX4600"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "EPSON Stylus CX4700"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "EPSON Stylus CX4800"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "EPSON Stylus CX5100"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "EPSON Stylus CX5200"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5300"
+msgstr "EPSON Stylus CX5300"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "EPSON Stylus CX5400"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5700"
+msgstr "EPSON Stylus CX5700"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "EPSON Stylus CX5800"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "EPSON Stylus CX6300"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "EPSON Stylus CX6400"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "EPSON Stylus CX6500"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "EPSON Stylus CX6600"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "EPSON Stylus CX7700"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "EPSON Stylus CX7800"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "EPSON Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "EPSON Stylus D68"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "EPSON Stylus D88"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "EPSON Stylus DX3800"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "EPSON Stylus DX3850"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "EPSON Stylus DX4200"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "EPSON Stylus DX4250"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "EPSON Stylus DX4800"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
-msgstr ""
+#, fuzzy
+msgid "Epson PictureMate"
+msgstr "EPSON PictureMate"
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
-msgstr ""
+#, fuzzy
+msgid "Epson PictureMate Deluxe"
+msgstr "EPSON PictureMate Deluxe"
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
-msgstr ""
+#, fuzzy
+msgid "Epson CL 700"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
-msgstr ""
+#, fuzzy
+msgid "Epson EM 900C"
+msgstr "EPSON EM-900C"
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
-msgstr ""
+#, fuzzy
+msgid "Epson EM 930C"
+msgstr "EPSON EM-930C"
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
-msgstr ""
+#, fuzzy
+msgid "Epson MC 2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
-msgstr ""
+#, fuzzy
+msgid "Epson MC 5000"
+msgstr "EPSON MC-5000"
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
-msgstr ""
+#, fuzzy
+msgid "Epson MC 7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson MC 9000"
+msgstr "EPSON MC-9000"
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
-msgstr ""
+#, fuzzy
+msgid "Epson MC 10000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
-msgstr ""
+#, fuzzy
+msgid "Epson MJ 930C"
+msgstr "EPSON MJ-930C"
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
-msgstr ""
+#, fuzzy
+msgid "Epson MJ 5100C"
+msgstr "EPSON MJ-5100C"
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
-msgstr ""
+#, fuzzy
+msgid "Epson MJ 6000C"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
-msgstr ""
+#, fuzzy
+msgid "Epson MJ 8000C"
+msgstr "EPSON MJ-8000C"
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 700C"
+msgstr "EPSON PM-700C"
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 730C"
+msgstr "EPSON PM-730C"
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 740C"
+msgstr "EPSON PM-740C"
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 750C"
+msgstr "EPSON PM-750C"
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 760C"
+msgstr "EPSON PM-760C"
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 770C"
+msgstr "EPSON PM-770C"
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 780C"
+msgstr "EPSON PM-780C"
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 790PT"
+msgstr "EPSON PM-790PT"
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 800C"
+msgstr "EPSON PM-800C"
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 850PT"
+msgstr "EPSON PM-850PT"
 
 #: src/main/xmli18n-tmp.h:378
 #, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr "EPSON PM-870C"
 
 #: src/main/xmli18n-tmp.h:379
 #, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr "EPSON PM-880C"
 
 #: src/main/xmli18n-tmp.h:380
 #, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr "EPSON PM-930C"
 
 #: src/main/xmli18n-tmp.h:381
 #, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr "EPSON PM-940C"
 
 #: src/main/xmli18n-tmp.h:382
 #, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr "EPSON PM-950C"
 
 #: src/main/xmli18n-tmp.h:383
 #, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr "EPSON PM-970C"
 
 #: src/main/xmli18n-tmp.h:384
 #, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr "EPSON PM-980C"
 
 #: src/main/xmli18n-tmp.h:385
 #, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr "EPSON PM-2000C"
 
 #: src/main/xmli18n-tmp.h:386
 #, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr "EPSON PM-2200C"
 
 #: src/main/xmli18n-tmp.h:387
 #, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr "EPSON PM-3000C"
 
 #: src/main/xmli18n-tmp.h:388
 #, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr "EPSON PM-3300C"
 
 #: src/main/xmli18n-tmp.h:389
 #, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr "EPSON PM-3500C"
 
 #: src/main/xmli18n-tmp.h:390
 #, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr "EPSON PM-3700C"
 
 #: src/main/xmli18n-tmp.h:391
 #, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr "EPSON PM-4000PX"
 
 #: src/main/xmli18n-tmp.h:392
 #, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr "EPSON PM-5000C"
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 7000C"
+msgstr "EPSON PM-7000C"
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 9000C"
+msgstr "EPSON PM-9000C"
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "EPSON PM-10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "EPSON PM-A900"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "EPSON PM-D750"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "EPSON PM-D770"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "EPSON PM-D1000"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "EPSON PM-G700"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "EPSON PM-G720"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "EPSON PM-G800"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "EPSON PM-G820"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "EPSON PX-A650"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "EPSON PX-G900"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "EPSON PX-G920"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "EPSON PX-G5000"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "EPSON PX-V500"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "EPSON PX-V600"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "EPSON PX-5500"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 7000"
+msgstr "EPSON PX-7000"
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 9000"
+msgstr "EPSON PX-9000"
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
-msgstr ""
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
-msgstr ""
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
-msgstr ""
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
-msgstr ""
+#, fuzzy
+msgid "Canon GP 335"
+msgstr "Canon BJC 85"
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
-msgstr ""
+#, fuzzy
+msgid "Canon LBP-4sx"
+msgstr "Canon BJC 240"
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
-msgstr ""
+#, fuzzy
+msgid "Canon LBP-430"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
-msgstr ""
+#, fuzzy
+msgid "Canon LBP-1000"
+msgstr "Canon CP100"
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
-msgstr ""
+#, fuzzy
+msgid "Canon LBP-1260"
+msgstr "Canon CP220"
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
-msgstr ""
+#, fuzzy
+msgid "Canon LBP-1760"
+msgstr "Canon CP100"
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Définir une nouvelle imprimante"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Définir une nouvelle imprimante"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Définir une nouvelle imprimante"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Définir une nouvelle imprimante"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+#, fuzzy
+msgid "HP Business Inkjet 2200"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:495
+#, fuzzy
+msgid "HP Business Inkjet 2230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:496
+#, fuzzy
+msgid "HP Business Inkjet 2250"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+#, fuzzy
+msgid "HP Business Inkjet 2280"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+#, fuzzy
+msgid "HP Color LaserJet 2500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:502
+#, fuzzy
+msgid "HP Color LaserJet 4500"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "HP Color LaserJet 4550"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:504
+#, fuzzy
+msgid "HP Color LaserJet 4600"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:505
+#, fuzzy
+msgid "HP Color LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:506
+#, fuzzy
+msgid "HP Color LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:507
+#, fuzzy
+msgid "HP Color LaserJet 5500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:508
+#, fuzzy
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr "HP DesignJet 430"
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr "HP DesignJet 450C"
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr "HP DesignJet 488CA"
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:516
+#, fuzzy
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:518
+#, fuzzy
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500C"
+
+#: src/main/xmli18n-tmp.h:519
+#, fuzzy
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500C"
+
+#: src/main/xmli18n-tmp.h:520
+#, fuzzy
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:522
+#, fuzzy
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:523
+#, fuzzy
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:526
+#, fuzzy
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:527
+#, fuzzy
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:531
+#, fuzzy
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:532
+#, fuzzy
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:534
+#, fuzzy
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:535
+#, fuzzy
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:536
+#, fuzzy
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:537
+#, fuzzy
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:538
+#, fuzzy
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:539
+#, fuzzy
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:540
+#, fuzzy
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:541
+#, fuzzy
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:542
+#, fuzzy
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:543
+#, fuzzy
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:544
+#, fuzzy
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:545
+#, fuzzy
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:546
+#, fuzzy
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:547
+#, fuzzy
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:548
+#, fuzzy
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:549
+#, fuzzy
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:550
+#, fuzzy
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:551
+#, fuzzy
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:552
+#, fuzzy
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:553
+#, fuzzy
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:554
+#, fuzzy
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:557
+#, fuzzy
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:558
+#, fuzzy
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:559
+#, fuzzy
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:560
+#, fuzzy
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:561
+#, fuzzy
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:563
+#, fuzzy
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr "HP DeskJet 842C"
+
+#: src/main/xmli18n-tmp.h:565
+#, fuzzy
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr "HP DeskJet 850C"
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:570
+#, fuzzy
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:571
+#, fuzzy
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:574
+#, fuzzy
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:575
+#, fuzzy
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:576
+#, fuzzy
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:577
+#, fuzzy
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:578
+#, fuzzy
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:579
+#, fuzzy
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:580
+#, fuzzy
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:581
+#, fuzzy
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:582
+#, fuzzy
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:583
+#, fuzzy
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:584
+#, fuzzy
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:585
+#, fuzzy
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:586
+#, fuzzy
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:587
+#, fuzzy
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:588
+#, fuzzy
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:589
+#, fuzzy
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:590
+#, fuzzy
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:591
+#, fuzzy
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:592
+#, fuzzy
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:593
+#, fuzzy
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:594
+#, fuzzy
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr "HP DeskJet 1100C"
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:597
+#, fuzzy
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:601
+#, fuzzy
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:602
+#, fuzzy
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:603
+#, fuzzy
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:604
+#, fuzzy
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:605
+#, fuzzy
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:606
+#, fuzzy
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:607
+#, fuzzy
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:608
+#, fuzzy
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:609
+#, fuzzy
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:610
+#, fuzzy
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:611
+#, fuzzy
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:612
+#, fuzzy
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:613
+#, fuzzy
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:614
+#, fuzzy
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:615
+#, fuzzy
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:616
+#, fuzzy
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:617
+#, fuzzy
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:618
+#, fuzzy
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:619
+#, fuzzy
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:621
+#, fuzzy
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:622
+#, fuzzy
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:623
+#, fuzzy
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr "HP LaserJet 4Si"
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:626
+#, fuzzy
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:627
+#, fuzzy
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:628
+#, fuzzy
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:629
+#, fuzzy
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:630
+#, fuzzy
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:632
+#, fuzzy
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:633
+#, fuzzy
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:634
+#, fuzzy
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:635
+#, fuzzy
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:636
+#, fuzzy
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:637
+#, fuzzy
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:638
+#, fuzzy
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:639
+#, fuzzy
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:640
+#, fuzzy
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:641
+#, fuzzy
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:642
+#, fuzzy
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:643
+#, fuzzy
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:644
+#, fuzzy
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:645
+#, fuzzy
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:646
+#, fuzzy
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:647
+#, fuzzy
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:648
+#, fuzzy
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:649
+#, fuzzy
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:650
+#, fuzzy
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:651
+#, fuzzy
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:652
+#, fuzzy
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:653
+#, fuzzy
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:654
+#, fuzzy
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:655
+#, fuzzy
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:656
+#, fuzzy
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:657
+#, fuzzy
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:658
+#, fuzzy
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:659
+#, fuzzy
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:660
+#, fuzzy
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:661
+#, fuzzy
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:662
+#, fuzzy
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:663
+#, fuzzy
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:664
+#, fuzzy
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:665
+#, fuzzy
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:666
+#, fuzzy
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:667
+#, fuzzy
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+#, fuzzy
+msgid "HP OfficeJet 300"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:671
+#, fuzzy
+msgid "HP OfficeJet 330"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:672
+#, fuzzy
+msgid "HP OfficeJet 350"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:673
+#, fuzzy
+msgid "HP OfficeJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:674
+#, fuzzy
+msgid "HP OfficeJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:675
+#, fuzzy
+msgid "HP OfficeJet 570"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:676
+#, fuzzy
+msgid "HP OfficeJet 580"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:677
+#, fuzzy
+msgid "HP OfficeJet 590"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:678
+#, fuzzy
+msgid "HP OfficeJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:679
+#, fuzzy
+msgid "HP OfficeJet 610"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:680
+#, fuzzy
+msgid "HP OfficeJet 625"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:681
+#, fuzzy
+msgid "HP OfficeJet 630"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:682
+#, fuzzy
+msgid "HP OfficeJet 635"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:683
+#, fuzzy
+msgid "HP OfficeJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:684
+#, fuzzy
+msgid "HP OfficeJet 710"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:685
+#, fuzzy
+msgid "HP OfficeJet 720"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:686
+#, fuzzy
+msgid "HP OfficeJet 725"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:687
+#, fuzzy
+msgid "HP OfficeJet 5105"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:688
+#, fuzzy
+msgid "HP OfficeJet 5110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:689
+#, fuzzy
+msgid "HP OfficeJet 5110xi"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:690
+#, fuzzy
+msgid "HP OfficeJet 6105"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:691
+#, fuzzy
+msgid "HP OfficeJet 6110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:692
+#, fuzzy
+msgid "HP OfficeJet 7110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:693
+#, fuzzy
+msgid "HP OfficeJet 7130"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:694
+#, fuzzy
+msgid "HP OfficeJet 7140"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:695
+#, fuzzy
+msgid "HP OfficeJet D125"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+#, fuzzy
+msgid "HP OfficeJet D145"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:698
+#, fuzzy
+msgid "HP OfficeJet D155"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:699
+#, fuzzy
+msgid "HP OfficeJet G55"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:700
+#, fuzzy
+msgid "HP OfficeJet G85"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:701
+#, fuzzy
+msgid "HP OfficeJet G95"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:702
+#, fuzzy
+msgid "HP OfficeJet K60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:703
+#, fuzzy
+msgid "HP OfficeJet K60xi"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:704
+#, fuzzy
+msgid "HP OfficeJet K80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:705
+#, fuzzy
+msgid "HP OfficeJet K80xi"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:706
+#, fuzzy
+msgid "HP OfficeJet LX"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:707
+#, fuzzy
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:708
+#, fuzzy
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+#, fuzzy
+msgid "HP OfficeJet R40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:711
+#, fuzzy
+msgid "HP OfficeJet R45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:712
+#, fuzzy
+msgid "HP OfficeJet R60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:713
+#, fuzzy
+msgid "HP OfficeJet R65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:714
+#, fuzzy
+msgid "HP OfficeJet R80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:715
+#, fuzzy
+msgid "HP OfficeJet T45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:716
+#, fuzzy
+msgid "HP OfficeJet T65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:717
+#, fuzzy
+msgid "HP OfficeJet V40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:718
+#, fuzzy
+msgid "HP OfficeJet V40xi"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+#, fuzzy
+msgid "HP PSC 2110"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+#, fuzzy
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:730
+#, fuzzy
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:731
+#, fuzzy
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:732
+#, fuzzy
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:733
+#, fuzzy
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:734
+#, fuzzy
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:735
+#, fuzzy
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:738
+#, fuzzy
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:739
+#, fuzzy
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:740
+#, fuzzy
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:741
+#, fuzzy
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/main/xmli18n-tmp.h:796
+#, fuzzy
+msgid "Lexmark Optra E"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+#, fuzzy
+msgid "Sony IJP-V100"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Configuration de l'imprimante"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/main/xmli18n-tmp.h:867
+#, fuzzy
+msgid "Olympus P-10"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:868
+#, fuzzy
+msgid "Olympus P-11"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:869
+#, fuzzy
+msgid "Olympus P-200"
+msgstr "Olympus P200"
+
+#: src/main/xmli18n-tmp.h:870
+#, fuzzy
+msgid "Olympus P-300"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:871
+#, fuzzy
+msgid "Olympus P-300E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:872
+#, fuzzy
+msgid "Olympus P-300U"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:873
+#, fuzzy
+msgid "Olympus P-330E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:874
+#, fuzzy
+msgid "Olympus P-330NE"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:875
+#, fuzzy
+msgid "Olympus P-400"
+msgstr "Olympus P400"
+
+#: src/main/xmli18n-tmp.h:876
+#, fuzzy
+msgid "Olympus P-440"
+msgstr "Olympus P440"
+
+#: src/main/xmli18n-tmp.h:877
+#, fuzzy
+msgid "Canon CP-100"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:878
+#, fuzzy
+msgid "Canon CP-200"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:879
+#, fuzzy
+msgid "Canon CP-220"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:880
+#, fuzzy
+msgid "Canon CP-300"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:881
+#, fuzzy
+msgid "Canon CP-330"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:882
+#, fuzzy
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:883
+#, fuzzy
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:884
+#, fuzzy
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:885
+#, fuzzy
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:886
+#, fuzzy
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:889
+#, fuzzy
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix CX-400"
+
+#: src/main/xmli18n-tmp.h:890
+#, fuzzy
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix CX-550"
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4458,32 +6382,28 @@ 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:274 src/gutenprintui2/panel.c:274
-#, fuzzy
 msgid "Points"
-msgstr "Imprimer"
+msgstr "Points"
 
 #: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
-#, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Défini l'unité de base de mesure en pouce"
+msgstr "Défini l'unité de base de mesure en points (1/72\")"
 
 #: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
-msgstr ""
+msgstr "mm"
 
 #: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
-#, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Défini l'unité de base de mesure en centimètres"
+msgstr "Définir l'unité de base de mesure en millimètres"
 
 #: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
-msgstr ""
+msgstr "Pica"
 
 #: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
-#, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Défini l'unité de base de mesure en pouce"
+msgstr "Défini l'unité de base de mesure en picas (1/12\")"
 
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
@@ -4494,18 +6414,16 @@ msgid "Print in shades of gray using black ink"
 msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
 
 #: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
-#, fuzzy
 msgid "Standard Command"
-msgstr "Standard"
+msgstr "Commande Standard"
 
 #: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
 #: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
-#, fuzzy
 msgid "Custom Command"
-msgstr "Commande :"
+msgstr "Commande personalisée:"
 
 #: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
@@ -4518,16 +6436,14 @@ msgid "File"
 msgstr "Fichier"
 
 #: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
-#, fuzzy
 msgid "Print to a file"
-msgstr "Imprimer dans un fichier ?"
+msgstr "Imprimer dans un fichier"
 
 #: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
-msgstr ""
+msgstr "Editer Courbe..."
 
 #: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
-#, fuzzy
 msgid "Set Default"
 msgstr "Valeurs par défaut"
 
@@ -4608,13 +6524,12 @@ msgstr ""
 "retournera à sa position originale."
 
 #: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
-#, fuzzy
 msgid "Paper Size"
-msgstr "Taille"
+msgstr "Taille du papier"
 
 #: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
-msgstr ""
+msgstr "Afficher toutes les tailles de papier"
 
 #: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
@@ -4639,22 +6554,20 @@ msgid "Height of the paper that you wish to print to"
 msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
 #: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
-#, fuzzy
 msgid "Automatic Paper Size"
-msgstr "Taille"
+msgstr "Taille de papier automatique"
 
 #: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
-msgstr ""
+msgstr "Nombre de copies"
 
 #: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr ""
+msgstr "Choisissez le nombre de copies à imprimer; Une valeur entre 1 et 100"
 
 #: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
-#, fuzzy
 msgid "Image Position"
-msgstr "Position"
+msgstr "Position de l'image"
 
 #: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
@@ -4723,7 +6636,6 @@ msgid "Bottom:"
 msgstr "Bas :"
 
 #: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
-#, fuzzy
 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"
@@ -4737,7 +6649,6 @@ msgid "Center:"
 msgstr "Centrer :"
 
 #: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
-#, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalement"
 
@@ -4754,7 +6665,6 @@ msgid "Center the image on the paper"
 msgstr "Centrer l'image sur le papier"
 
 #: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
-#, fuzzy
 msgid "Vertical"
 msgstr "Verticalement"
 
@@ -4767,14 +6677,12 @@ msgid "Setup Printer"
 msgstr "Configuration de l'imprimante"
 
 #: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
-#, fuzzy
 msgid "Printer Make:"
-msgstr "Nom de l'imprimante :"
+msgstr "Fabricant de l'imprimante :"
 
 #: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
-#, fuzzy
 msgid "Select the make of your printer"
-msgstr "Sélectionnez le modèle de votre imprimante"
+msgstr "Sélectionnez le fabricant de votre imprimante"
 
 #: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
 #: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
@@ -4812,28 +6720,24 @@ msgstr ""
 "voulez utiliser pour l'impression"
 
 #: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
-#, fuzzy
 msgid "Printer Queue:"
-msgstr "Nom de l'imprimante :"
+msgstr "File d'impression"
 
 #: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
-#, fuzzy
 msgid "Enter the correct command to print to your printer. "
-msgstr "Entrez le nom de fichier PPD correct pour votre imprimante"
+msgstr "Entrez la commande correct pour imprimer vers votre imprimante."
 
 #: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
-msgstr ""
+msgstr "Entrer le nom du fichier vers lequel imprimer"
 
 #: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
-#, fuzzy
 msgid "File to print to"
-msgstr "test d'impression"
+msgstr "Fichier à imprimer vers"
 
 #: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
-#, fuzzy
 msgid "Print To File"
-msgstr "Imprimer dans un fichier ?"
+msgstr "Imprimer dans un fichier"
 
 #: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
@@ -4849,17 +6753,14 @@ 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:1798 src/gutenprintui2/panel.c:1798
-#, fuzzy
 msgid "About Gutenprint "
-msgstr "À propos de Gimp-Print"
+msgstr "À propos de Gutenprint"
 
 #: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
 msgid "Gutenprint Version "
-msgstr "Version de Gimp-Print"
+msgstr "Version de Gutenprint"
 
 #: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4884,7 +6785,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
+"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
 "et le reste de l'équipe de développement de Gimp-Print.\n"
 "\n"
 "Vistitez notre site web à http://gimp-print.sourceforge.net.\n"
@@ -4944,9 +6845,8 @@ msgstr ""
 "ensemble de réglage que vous souhaitez réutiliser plus tard."
 
 #: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
-#, fuzzy
 msgid "Image Size"
-msgstr "Taille"
+msgstr "Taille de l'image"
 
 #: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
@@ -4958,7 +6858,7 @@ msgstr "Régler l'échelle (taille) de l'image"
 
 #: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
-msgstr ""
+msgstr "Facteur d'échelle"
 
 #: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
@@ -4997,8 +6897,8 @@ msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
-"Utiliser la taille \n"
-"de l'image originale"
+"Utiliser la taille\n"
+"d'origine de l'image"
 
 #: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
@@ -5022,12 +6922,11 @@ msgstr "Aperçu de l'image"
 
 #: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
-msgstr ""
+msgstr "Visualiser Canaux de sortie:"
 
 #: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
-#, fuzzy
 msgid "Output"
-msgstr "Type de sortie :"
+msgstr "Sortie"
 
 #: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
@@ -5049,9 +6948,8 @@ msgstr ""
 "algorithme de tramage"
 
 #: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
-#, fuzzy
 msgid "Size Units:"
-msgstr "Unités :"
+msgstr "Unités: "
 
 #: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
@@ -5073,7 +6971,7 @@ msgstr ""
 
 #: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
 msgid "Berkeley lpd (/etc/lpc)"
@@ -5096,145 +6994,140 @@ msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
 #: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
-#, fuzzy
 msgid "Printer"
-msgstr "Imprimer"
+msgstr "Imprimante"
 
 #: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
-#, fuzzy
 msgid "(Default Printer)"
-msgstr "Configuration de l'imprimante"
+msgstr "(Imprimante par défaut)"
 
 #: src/gutenprintui2/curve.c:130
-#, fuzzy
 msgid "Curve type"
-msgstr "Noir"
+msgstr "Type de courbe"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
 msgstr ""
+"Cette courbe est-elle linéaire, interpolée par splines, ou à main levée"
 
 #: src/gutenprintui2/curve.c:139
 msgid "Minimum X"
-msgstr ""
+msgstr "X Minimum"
 
 #: src/gutenprintui2/curve.c:140
 msgid "Minimum possible value for X"
-msgstr ""
+msgstr "Valeur Minimum possible pour X"
 
 #: src/gutenprintui2/curve.c:149
 msgid "Maximum X"
-msgstr ""
+msgstr "X Maximum"
 
 #: src/gutenprintui2/curve.c:150
 msgid "Maximum possible X value"
-msgstr ""
+msgstr "Valeur Maximum possible pour X"
 
 #: src/gutenprintui2/curve.c:159
 msgid "Minimum Y"
-msgstr ""
+msgstr "Y Minimum"
 
 #: src/gutenprintui2/curve.c:160
 msgid "Minimum possible value for Y"
-msgstr ""
+msgstr "Valeur Minimum possible pour Y"
 
 #: src/gutenprintui2/curve.c:169
 msgid "Maximum Y"
-msgstr ""
+msgstr "Y Maximum"
 
 #: src/gutenprintui2/curve.c:170
 msgid "Maximum possible value for Y"
-msgstr ""
+msgstr "Valeur Maximum possible pour Y"
 
 #: src/gutenprintui2/gammacurve.c:418
 msgid "_Gamma value"
-msgstr ""
+msgstr "valeur _Gamma"
 
-#: src/cups/genppd.c:134
-#, fuzzy
+#: src/cups/genppd.c:133
 msgid "Printer Features"
-msgstr "Paramètres de l'imprimante"
+msgstr "Fonctionalités de l'imprimante"
 
-#: src/cups/genppd.c:135
-#, fuzzy
+#: src/cups/genppd.c:134
 msgid "Output Control"
-msgstr "Type de sortie :"
+msgstr "Contrôles de sortie"
 
-#: src/cups/genppd.c:140
-#, fuzzy
+#: src/cups/genppd.c:139
 msgid "Common"
-msgstr "Commande :"
+msgstr "Commun"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bac 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bac 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bac 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bac 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
-#, fuzzy
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 msgid "Gutenprint"
-msgstr "test d'impression"
+msgstr "Gutenprint"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "French"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
-msgstr ""
+msgstr "Non"
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
-msgstr ""
+msgstr "Ajustement fin"
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Version d'escputil"
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
-", Copyright © 2000-2001 Robert Krawitz\n"
+", Copyright © 2000-2003 Robert Krawitz\n"
 "Escputil ; pour plus de détails, tapez « escputil -l »\n"
 "Ce logiciel est un logiciel libre, vous pouvez le redistribuer\n"
 "sous certaines conditions; tapez « escputil -l » pour plus de détails.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5270,11 +7163,12 @@ msgstr ""
 "avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5312,6 +7206,8 @@ msgid ""
 "    -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 ""
 "Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                       [-P imprimante | -r périphérique] [-u] [-q] [-m "
@@ -5361,12 +7257,13 @@ msgstr ""
 "   -m|--model         Indique le modèle précis pour l'alignement des têtes.\n"
 "\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5401,9 +7298,11 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Usage: escputil [OPTIONS] [COMMANDE]\n"
-"Usage: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"Utilisation: escputil [OPTIONS] [COMMANDE]\n"
+"Utilisation: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model]\n"
 "Maintenance sur les imprimantes EPSON Stylus (R).\n"
 "Exemples: escputil -c -P stpex-on-third-floor\n"
@@ -5424,7 +7323,7 @@ msgstr ""
 "peut\n"
 "          conduire à une piètre qualité d'impression et/ou endommager "
 "l'imprimante.\n"
-"    -s Retrouver le status de l'imprimante.\n"
+"    -s Retrouver le statut de l'imprimante.\n"
 "    -i Obtenir le niveau d'encre de l'imprimante.  Ceci nécessite\n"
 "          un accès en lecture/écriture au périphérique d'entrée.\n"
 "    -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
@@ -5435,7 +7334,7 @@ msgstr ""
 "    -h Imprime ce message d'aide.\n"
 "  Options:\n"
 "    -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
-"          Par déaut l'imprimante système.\n"
+"          Par défaut l'imprimante système.\n"
 "    -r Spécifie le nom du périphérique sur lequel écrire directement\n"
 "          plutôt que de passer via une queue d'impression.\n"
 "    -u L'imprimante est une nouvelle imprimante (Stylus Color 740 ou plus "
@@ -5443,74 +7342,84 @@ 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:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Vous ne pouvez spécifier qu'une imprimante ou périphérique"
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Option inconnue %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
-msgstr ""
+msgstr "Utilisation: %s [OPTIONS] commande\n"
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Impossible de lire à partir de %s : %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5519,15 +7428,7 @@ msgstr ""
 "\n"
 "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5538,88 +7439,230 @@ 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:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
+msgstr "Inconnu"
+
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+msgid "Status: Waiting\n"
+msgstr "Saturation"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Erreur en entrée\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Erreur en entrée\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
 msgstr ""
-"Obtenir les niveaux d'encre demande d'utiliser un périphérique d'entrée\n"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, fuzzy, c-format
+msgid "Ink Levels:\n"
+msgstr "niveaux d'encre"
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Encre couleur"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
-#, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
 
-#: src/escputil/escputil.c:1144
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr "niveaux d'encre"
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr "statut"
+
+#: src/escputil/escputil.c:1339
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Obtenir %s requiert d'utiliser un périphérique d'entrée\n"
+
+#: src/escputil/escputil.c:1451
+#, 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 d'entrée\n"
+"Obtenir les informations d'encre étendues requiert l'utilisation d'un "
+"périphérique d'entrée\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
-msgstr ""
+msgstr "Numéro de pièce"
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
-#: src/escputil/escputil.c:1371
+#: 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 "
 "d'entrée\n"
 
-#: src/escputil/escputil.c:1389
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1689
+#, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
+msgstr "Ne peux identifier le modèle d'imprimante.\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Nettoyage des têtes...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
 "dans l'imprimante\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5704,7 +7747,7 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5780,12 +7823,17 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5805,13 +7853,13 @@ msgstr ""
 "Il vous sera ensuite demandé de confirmer votre choix\n"
 "Que voulez-vous faire (s, q, r) ?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5819,7 +7867,7 @@ msgstr ""
 "Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
 "enregistrer :\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5829,7 +7877,7 @@ msgstr ""
 "Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
 "opération.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5838,12 +7886,12 @@ msgstr ""
 "S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
 "reprendre l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Répétition de l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5858,17 +7906,17 @@ msgstr ""
 "Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
 "enregistrer les réglages de votre imprimante.\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "À propos de l'enregistrement des réglages..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "Échec !\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5877,27 +7925,27 @@ msgstr ""
 "Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
 "l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "Succès !\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Commande non reconnue.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "La dernière commande n'a pas été confirmée.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5914,12 +7962,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:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Pressez Entrée pour continuer > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5930,42 +7978,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:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Passe #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, 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:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nombre hors-intervalle !\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, 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:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentative de réglage de l'alignement..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "Succès.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5978,7 +8026,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Erreur en entrée\n"
@@ -5987,11 +8035,11 @@ msgstr "Erreur en entrée\n"
 msgid "Printing..."
 msgstr "Impression en cours..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Fichier/Imprimer..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -6002,119 +8050,382 @@ msgid ""
 "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
 "not match the PPD file (%s).\n"
 msgstr ""
+"ijsgutenprint: la version de Gutenprint software installée (%s)\n"
+"  ne correspond pas au fichier PPD (%s).  Si vous avez mis à jour recemment\n"
+"  votre version de Gutenprint, vous devez reinstaller toutes les files "
+"d'impression.\n"
+"  Veuillez vous référer à la documentation fournie, ou a la commande "
+"``foomatic-ppdfile''\n"
+"  pour plus d'instructions.\n"
+"ERROR: la version de Gutenprint software installée (%s) ne correspond pas au "
+"fichier PPD (%s).\n"
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Mauvais intervalle des couleurs : bps %d canaux %d intervalle %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:198
+#, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Pas de buffer de ligne\n"
+msgstr "Pas de tampon de ligne\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Impossible d'interpréter le paramètre %s=%s (un nombre est attendu)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "L'imprimante doit être spécifiée avec le -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:499
+#, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "L'imprimante %s n'est pas un modèle connu\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:840
+#, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Imprimante inconnue %s\n"
+msgstr "Mauvais paramètre %s %d\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header échec %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init échec %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Incapable d'ouvrir le descripteur de fichier : %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Incapable d'ouvrir %s : %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1338
+#, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Imprimante inconnue %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1508
+#, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Mauvais paramètres, ne peut pâs continuer !\n"
+msgstr "Mauvais paramètres, ne peut pas continuer !\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
 
 #, fuzzy
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header échec %d\n"
+
+#~ msgid "Canon BJC 4400 photo"
+#~ msgstr "Canon BJC 4400 photo"
+
+#~ msgid "Canon PIXMA iP4000"
+#~ msgstr "Canon PIXMA iP4000"
+
+#~ msgid "EPSON Stylus C50"
+#~ msgstr "EPSON Stylus C50"
+
+#~ msgid "EPSON Stylus C60"
+#~ msgstr "EPSON Stylus C60"
+
+#~ msgid "EPSON Stylus C61"
+#~ msgstr "EPSON Stylus C61"
+
+#~ msgid "EPSON Stylus C62"
+#~ msgstr "EPSON Stylus C62"
+
+#~ msgid "EPSON Stylus C70"
+#~ msgstr "EPSON Stylus C70"
+
+#~ msgid "EPSON Stylus C80"
+#~ msgstr "EPSON Stylus C80"
+
+#~ msgid "EPSON Stylus C82"
+#~ msgstr "EPSON Stylus C82"
+
+#~ msgid "EPSON Stylus Color"
+#~ msgstr "EPSON Stylus Color"
+
+#~ msgid "EPSON Stylus Color Pro"
+#~ msgstr "EPSON Stylus Color Pro"
+
+#~ msgid "EPSON Stylus Color Pro XL"
+#~ msgstr "EPSON Stylus Color Pro XL"
+
+#~ msgid "EPSON Stylus Color 400"
+#~ msgstr "EPSON Stylus Color 400"
+
+#~ msgid "EPSON Stylus Color 440"
+#~ msgstr "EPSON Stylus Color 440"
+
+#~ msgid "EPSON Stylus Color 460"
+#~ msgstr "EPSON Stylus Color 460"
+
+#~ msgid "EPSON Stylus Color 480"
+#~ msgstr "EPSON Stylus Color 480"
+
+#~ msgid "EPSON Stylus Color 500"
+#~ msgstr "EPSON Stylus Color 500"
+
+#~ msgid "EPSON Stylus Color 580"
+#~ msgstr "EPSON Stylus Color 580"
+
+#~ msgid "EPSON Stylus Color 600"
+#~ msgstr "EPSON Stylus Color 600"
+
+#~ msgid "EPSON Stylus Color 640"
+#~ msgstr "EPSON Stylus Color 640"
+
+#~ msgid "EPSON Stylus Color 660"
+#~ msgstr "EPSON Stylus Color 660"
+
+#~ msgid "EPSON Stylus Color 670"
+#~ msgstr "EPSON Stylus Color 670"
+
+#~ msgid "EPSON Stylus Color 680"
+#~ msgstr "EPSON Stylus Color 680"
+
+#~ msgid "EPSON Stylus Color 740"
+#~ msgstr "EPSON Stylus Color 740"
+
+#~ msgid "EPSON Stylus Color 760"
+#~ msgstr "EPSON Stylus Color 760"
+
+#~ msgid "EPSON Stylus Color 777"
+#~ msgstr "EPSON Stylus Color 777"
+
+#~ msgid "EPSON Stylus Color 800"
+#~ msgstr "EPSON Stylus Color 800"
+
+#~ msgid "EPSON Stylus Color 850"
+#~ msgstr "EPSON Stylus Color 850"
+
+#~ msgid "EPSON Stylus Color 860"
+#~ msgstr "EPSON Stylus Color 860"
+
+#~ msgid "EPSON Stylus Color 880"
+#~ msgstr "EPSON Stylus Color 880"
+
+#~ msgid "EPSON Stylus Color 83"
+#~ msgstr "EPSON Stylus Color 83"
+
+#~ msgid "EPSON Stylus Color 900"
+#~ msgstr "EPSON Stylus Color 900"
+
+#~ msgid "EPSON Stylus Color 980"
+#~ msgstr "EPSON Stylus Color 980"
+
+#~ msgid "EPSON Stylus Color 1160"
+#~ msgstr "EPSON Stylus Color 1160"
+
+#~ msgid "EPSON Stylus Color 1500"
+#~ msgstr "EPSON Stylus Color 1500"
+
+#~ msgid "EPSON Stylus Color 1520"
+#~ msgstr "EPSON Stylus Color 1520"
+
+#~ msgid "EPSON Stylus Color 3000"
+#~ msgstr "EPSON Stylus Color 3000"
+
+#~ msgid "EPSON Stylus Photo"
+#~ msgstr "EPSON Stylus Photo"
+
+#~ msgid "EPSON Stylus Photo 700"
+#~ msgstr "EPSON Stylus Photo 700"
+
+#~ msgid "EPSON Stylus Photo EX"
+#~ msgstr "EPSON Stylus Photo EX"
+
+#~ msgid "EPSON Stylus Photo 720"
+#~ msgstr "EPSON Stylus Photo 720"
+
+#~ msgid "EPSON Stylus Photo 750"
+#~ msgstr "EPSON Stylus Photo 750"
+
+#~ msgid "EPSON Stylus Photo 780"
+#~ msgstr "EPSON Stylus Photo 780"
+
+#~ msgid "EPSON Stylus Photo 785EPX"
+#~ msgstr "EPSON Stylus Photo 785EPX"
+
+#~ msgid "EPSON Stylus Photo 790"
+#~ msgstr "EPSON Stylus Photo 790"
+
+#~ msgid "EPSON Stylus Photo 810"
+#~ msgstr "EPSON Stylus Photo 810"
+
+#~ msgid "EPSON Stylus Photo 820"
+#~ msgstr "EPSON Stylus Photo 820"
+
+#~ msgid "EPSON Stylus Photo 830"
+#~ msgstr "EPSON Stylus Photo 830"
+
+#~ msgid "EPSON Stylus Photo 870"
+#~ msgstr "EPSON Stylus Photo 870"
+
+#~ msgid "EPSON Stylus Photo 875"
+#~ msgstr "EPSON Stylus Photo 875"
+
+#~ msgid "EPSON Stylus Photo 890"
+#~ msgstr "EPSON Stylus Photo 890"
+
+#~ msgid "EPSON Stylus Photo 895"
+#~ msgstr "EPSON Stylus Photo 895"
+
+#~ msgid "EPSON Stylus Photo 900"
+#~ msgstr "EPSON Stylus Photo 900"
+
+#~ msgid "EPSON Stylus Photo 915"
+#~ msgstr "EPSON Stylus Photo 915"
+
+#~ msgid "EPSON Stylus Photo 925"
+#~ msgstr "EPSON Stylus Photo 925"
+
+#~ msgid "EPSON Stylus Photo 950"
+#~ msgstr "EPSON Stylus Photo 950"
+
+#~ msgid "EPSON Stylus Photo 960"
+#~ msgstr "EPSON Stylus Photo 960"
+
+#~ msgid "EPSON Stylus Photo 1200"
+#~ msgstr "EPSON Stylus Photo 1200"
+
+#~ msgid "EPSON Stylus Photo 1270"
+#~ msgstr "EPSON Stylus Photo 1270"
+
+#~ msgid "EPSON Stylus Photo 1280"
+#~ msgstr "EPSON Stylus Photo 1280"
+
+#~ msgid "EPSON Stylus Photo 1290"
+#~ msgstr "EPSON Stylus Photo 1290"
+
+#~ msgid "EPSON Stylus Photo 2000P"
+#~ msgstr "EPSON Stylus Photo 2000P"
+
+#~ msgid "EPSON Stylus Photo 2100"
+#~ msgstr "EPSON Stylus Photo 2100"
+
+#~ msgid "EPSON Stylus Photo 2200"
+#~ msgstr "EPSON Stylus Photo 2200"
+
+#~ msgid "EPSON Stylus Pro 5000"
+#~ msgstr "EPSON Stylus Pro 5000"
+
+#~ msgid "EPSON Stylus Pro 5500"
+#~ msgstr "EPSON Stylus Pro 5500"
+
+#~ msgid "EPSON Stylus Pro 7000"
+#~ msgstr "EPSON Stylus Pro 7000"
+
+#~ msgid "EPSON Stylus Pro 7500"
+#~ msgstr "EPSON Stylus Pro 7500"
+
+#~ msgid "EPSON Stylus Pro 7600"
+#~ msgstr "EPSON Stylus Pro 7600"
+
+#~ msgid "EPSON Stylus Pro 9000"
+#~ msgstr "EPSON Stylus Pro 9000"
+
+#~ msgid "EPSON Stylus Pro 9500"
+#~ msgstr "EPSON Stylus Pro 9500"
+
+#~ msgid "EPSON Stylus Pro 9600"
+#~ msgstr "EPSON Stylus Pro 9600"
+
+#~ msgid "EPSON Stylus Pro 10000"
+#~ msgstr "EPSON Stylus Pro 10000"
+
+#~ msgid "EPSON Stylus Scan 2000"
+#~ msgstr "EPSON Stylus Scan 2000"
+
+#~ msgid "EPSON Stylus Scan 2500"
+#~ msgstr "EPSON Stylus Scan 2500"
+
+#~ msgid "EPSON CL-700"
+#~ msgstr "EPSON CL-700"
+
+#~ msgid "EPSON CL-750"
+#~ msgstr "EPSON CL-750"
+
+#~ msgid "EPSON CL-760"
+#~ msgstr "EPSON CL-760"
+
+#~ msgid "EPSON E-100"
+#~ msgstr "EPSON E-100"
+
+#~ msgid "EPSON MC-2000"
+#~ msgstr "EPSON MC-2000"
+
+#~ msgid "EPSON MC-7000"
+#~ msgstr "EPSON MC-7000"
+
+#~ msgid "EPSON MC-10000"
+#~ msgstr "EPSON MC-10000"
+
+#~ msgid "EPSON MJ-6000C"
+#~ msgstr "EPSON MJ-6000C"
+
+#~ msgid "HP DeskJet 600/600C"
+#~ msgstr "HP DeskJet 600/600C"
+
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "L'imprimante ne supporte pas l'affichage des tyoes d'encres!\n"
+
+#, fuzzy
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n"
 
@@ -6266,239 +8577,6 @@ msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
 #~ msgid "Stylus C42ux"
 #~ msgstr "Stylus C40ux"
 
-#, fuzzy
-#~ msgid "Stylus C50"
-#~ msgstr "Stylus C60"
-
-#~ msgid "Stylus C60"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "Stylus C61"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "Stylus C62"
-#~ msgstr "Stylus C60"
-
-#~ msgid "Stylus C70"
-#~ msgstr "Stylus C70"
-
-#~ msgid "Stylus C80"
-#~ msgstr "Stylus C80"
-
-#, fuzzy
-#~ msgid "Stylus C82"
-#~ msgstr "Stylus C80"
-
-#~ msgid "Stylus Color"
-#~ msgstr "Stylus Color"
-
-#~ msgid "Stylus Color Pro"
-#~ msgstr "Stylus Color Pro"
-
-#~ msgid "Stylus Color Pro XL"
-#~ msgstr "Stylus Color Pro XL"
-
-#~ msgid "Stylus Color 400"
-#~ msgstr "Stylus Color 400"
-
-#~ msgid "Stylus Color 440"
-#~ msgstr "Stylus Color 440"
-
-#~ msgid "Stylus Color 460"
-#~ msgstr "Stylus Color 460"
-
-#~ msgid "Stylus Color 480"
-#~ msgstr "Stylus Color 480"
-
-#~ msgid "Stylus Color 500"
-#~ msgstr "Stylus Color 500"
-
-#~ msgid "Stylus Color 580"
-#~ msgstr "Stylus Color 580"
-
-#~ msgid "Stylus Color 600"
-#~ msgstr "Stylus Color 600"
-
-#~ msgid "Stylus Color 640"
-#~ msgstr "Stylus Color 640"
-
-#~ msgid "Stylus Color 660"
-#~ msgstr "Stylus Color 660"
-
-#~ msgid "Stylus Color 670"
-#~ msgstr "Stylus Color 670"
-
-#~ msgid "Stylus Color 680"
-#~ msgstr "Stylus Color 680"
-
-#~ msgid "Stylus Color 740"
-#~ msgstr "Stylus Color 740"
-
-#~ msgid "Stylus Color 760"
-#~ msgstr "Stylus Color 760"
-
-#~ msgid "Stylus Color 777"
-#~ msgstr "Stylus Color 777"
-
-#~ msgid "Stylus Color 800"
-#~ msgstr "Stylus Color 800"
-
-#~ msgid "Stylus Color 850"
-#~ msgstr "Stylus Color 850"
-
-#~ msgid "Stylus Color 860"
-#~ msgstr "Stylus Color 860"
-
-#~ msgid "Stylus Color 880"
-#~ msgstr "Stylus Color 880"
-
-#~ msgid "Stylus Color 83"
-#~ msgstr "Stylus Color 83"
-
-#~ msgid "Stylus Color 900"
-#~ msgstr "Stylus Color 900"
-
-#~ msgid "Stylus Color 980"
-#~ msgstr "Stylus Color 980"
-
-#~ msgid "Stylus Color 1160"
-#~ msgstr "Stylus Color 1160"
-
-#~ msgid "Stylus Color 1500"
-#~ msgstr "Stylus Color 1500"
-
-#~ msgid "Stylus Color 1520"
-#~ msgstr "Stylus Color 1520"
-
-#~ msgid "Stylus Color 3000"
-#~ msgstr "Stylus Color 3000"
-
-#~ msgid "Stylus Photo"
-#~ msgstr "Stylus Photo"
-
-#~ msgid "Stylus Photo 700"
-#~ msgstr "Stylus Photo 700"
-
-#~ msgid "Stylus Photo EX"
-#~ msgstr "Stylus Photo EX"
-
-#~ msgid "Stylus Photo 720"
-#~ msgstr "Stylus Photo 720"
-
-#~ msgid "Stylus Photo 750"
-#~ msgstr "Stylus Photo 750"
-
-#~ msgid "Stylus Photo 780"
-#~ msgstr "Stylus Photo 780"
-
-#~ msgid "Stylus Photo 785"
-#~ msgstr "Stylus Photo 785"
-
-#~ msgid "Stylus Photo 790"
-#~ msgstr "Stylus Photo 790"
-
-#~ msgid "Stylus Photo 810"
-#~ msgstr "Stylus Photo 810"
-
-#~ msgid "Stylus Photo 820"
-#~ msgstr "Stylus Photo 820"
-
-#, fuzzy
-#~ msgid "Stylus Photo 830"
-#~ msgstr "Stylus Photo 780"
-
-#~ msgid "Stylus Photo 870"
-#~ msgstr "Stylus Photo 870"
-
-#~ msgid "Stylus Photo 875"
-#~ msgstr "Stylus Photo 875"
-
-#~ msgid "Stylus Photo 890"
-#~ msgstr "Stylus Photo 890"
-
-#~ msgid "Stylus Photo 895"
-#~ msgstr "Stylus Photo 895"
-
-#, fuzzy
-#~ msgid "Stylus Photo 900"
-#~ msgstr "Stylus Photo 700"
-
-#, fuzzy
-#~ msgid "Stylus Photo 915"
-#~ msgstr "Stylus Photo 895"
-
-#, fuzzy
-#~ msgid "Stylus Photo 925"
-#~ msgstr "Stylus Photo 895"
-
-#, fuzzy
-#~ msgid "Stylus Photo 950"
-#~ msgstr "Stylus Photo 750"
-
-#, fuzzy
-#~ msgid "Stylus Photo 960"
-#~ msgstr "Stylus Photo 790"
-
-#~ msgid "Stylus Photo 1200"
-#~ msgstr "Stylus Photo 1200"
-
-#~ msgid "Stylus Photo 1270"
-#~ msgstr "Stylus Photo 1270"
-
-#~ msgid "Stylus Photo 1280"
-#~ msgstr "Stylus Photo 1280"
-
-#~ msgid "Stylus Photo 1290"
-#~ msgstr "Stylus Photo 1290"
-
-#~ msgid "Stylus Photo 2000P"
-#~ msgstr "Stylus Photo 2000P"
-
-#, fuzzy
-#~ msgid "Stylus Photo 2100"
-#~ msgstr "Stylus Photo 1200"
-
-#, fuzzy
-#~ msgid "Stylus Photo 2200"
-#~ msgstr "Stylus Photo 1200"
-
-#~ msgid "Stylus Pro 5000"
-#~ msgstr "Stylus Pro 5000"
-
-#~ msgid "Stylus Pro 5500"
-#~ msgstr "Stylus Pro 5500"
-
-#~ msgid "Stylus Pro 7000"
-#~ msgstr "Stylus Pro 7000"
-
-#~ msgid "Stylus Pro 7500"
-#~ msgstr "Stylus Pro 7500"
-
-#, fuzzy
-#~ msgid "Stylus Pro 7600"
-#~ msgstr "Stylus Pro 7000"
-
-#~ msgid "Stylus Pro 9000"
-#~ msgstr "Stylus Pro 9000"
-
-#~ msgid "Stylus Pro 9500"
-#~ msgstr "Stylus Pro 9500"
-
-#, fuzzy
-#~ msgid "Stylus Pro 9600"
-#~ msgstr "Stylus Pro 9000"
-
-#~ msgid "Stylus Pro 10000"
-#~ msgstr "Stylus Pro 10000"
-
-#~ msgid "Stylus Scan 2000"
-#~ msgstr "Stylus Scan 2000"
-
-#~ msgid "Stylus Scan 2500"
-#~ msgstr "Stylus Scan 2500"
-
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 24ac3fd..d54f445 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr ""
 
@@ -73,12 +73,12 @@ msgstr ""
 msgid "Density"
 msgstr ""
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -131,181 +131,181 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 msgid "150x150 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 msgid "300x300 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 msgid "600x300 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 msgid "600x600 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 msgid "1200x600 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 msgid "Plain Paper PIXMA"
 msgstr ""
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr ""
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr ""
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr ""
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr ""
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -313,15 +313,15 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr ""
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -337,55 +337,55 @@ msgstr ""
 msgid "Basic Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr ""
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -394,21 +394,21 @@ msgstr ""
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -418,13 +418,13 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -433,156 +433,157 @@ msgstr ""
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 msgid "Cassette"
 msgstr ""
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
 msgstr ""
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
 msgstr ""
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
 msgstr ""
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
@@ -763,14 +764,15 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr ""
 
@@ -778,14 +780,15 @@ msgstr ""
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr ""
 
@@ -793,14 +796,15 @@ msgstr ""
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr ""
 
@@ -808,10 +812,10 @@ msgstr ""
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -828,10 +832,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1043,216 +1047,239 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 msgid "Print to CD"
 msgstr ""
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+msgid "Manual Feed (Front)"
+msgstr ""
+
+#: src/main/print-escp2-data.c:553
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+msgid "Photo Board"
+msgstr ""
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 msgid "Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 msgid "Light Light Black"
 msgstr ""
 
@@ -1423,122 +1450,122 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 msgid "Red Density"
 msgstr ""
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 msgid "Blue Density"
 msgstr ""
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1624,70 +1651,70 @@ msgstr ""
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr ""
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1698,8 +1725,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2073,55 +2100,76 @@ msgstr ""
 msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+msgid "1440 x 1440"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:145
+msgid "1440 x 1440 DPI High Quality"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:148
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+msgid "2880 x 1440 DPI High Quality"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:167
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:171
 msgid "5760 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 msgid "Eight Pass"
 msgstr ""
 
@@ -2202,7 +2250,7 @@ msgid "4x6"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:11
@@ -2682,1346 +2730,3050 @@ msgid "Wide Postcard"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:131
-msgid "Custom"
+msgid "Chilean Office"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:132
-msgid "89 mm Roll Paper"
+msgid "Chilean Double Letter"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:133
-msgid "4 Inch Roll Paper"
+msgid "Chilean Double Office"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:134
-msgid "5 Inch Roll Paper"
+msgid "Custom"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:135
-msgid "210 mm Roll Paper"
+msgid "89 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:136
-msgid "13 Inch Roll Paper"
+msgid "4 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:137
-msgid "22 Inch Roll Paper"
+msgid "5 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:138
-msgid "24 Inch Roll Paper"
+msgid "210 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:139
-msgid "36 Inch Roll Paper"
+msgid "13 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:140
-msgid "44 Inch Roll Paper"
+msgid "22 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
+msgid "24 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
+msgid "36 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
+msgid "44 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "EPSON Stylus C20"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C20SX"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C20UX"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "EPSON Stylus C40"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C40SX"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C40UX"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "EPSON Stylus C41"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C41SX"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C41UX"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "EPSON Stylus C42"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C42SX"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C42UX"
+msgid "Canon iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "EPSON Stylus C43"
+msgid "Epson Stylus C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C43SX"
+msgid "Epson Stylus C20SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C43UX"
+msgid "Epson Stylus C20UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C45"
+msgid "Epson Stylus C41"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C46"
+msgid "Epson Stylus C41SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "EPSON Stylus C48"
+msgid "Epson Stylus C41UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C50"
+msgid "Epson Stylus C42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C60"
+msgid "Epson Stylus C42SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C61"
+msgid "Epson Stylus C42UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C62"
+msgid "Epson Stylus C43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C63"
+msgid "Epson Stylus C43SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C64"
+msgid "Epson Stylus C43UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C65"
+msgid "Epson Stylus C44"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus C66"
+msgid "Epson Stylus C44SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:198
-msgid "EPSON Stylus C68"
+msgid "Epson Stylus C44UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus C70"
+msgid "Epson Stylus C45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus C80"
+msgid "Epson Stylus C46"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus C82"
+msgid "Epson Stylus C48"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus C83"
+msgid "Epson Stylus C50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus C84"
+msgid "Epson Stylus C60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:206
-msgid "EPSON Stylus C88"
+msgid "Epson Stylus C63"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color"
+msgid "Epson Stylus C64"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color Pro"
+msgid "Epson Stylus C65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color Pro XL"
+msgid "Epson Stylus C66"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 400"
+msgid "Epson Stylus C68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 440"
+msgid "Epson Stylus C70"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 460"
+msgid "Epson Stylus C80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 480"
+msgid "Epson Stylus C82"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 500"
+msgid "Epson Stylus C83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 580"
+msgid "Epson Stylus C84"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 600"
+msgid "Epson Stylus C85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 640"
+msgid "Epson Stylus C86"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 660"
+msgid "Epson Stylus C88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 670"
+msgid "Epson Stylus Color"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 680"
+msgid "Epson Stylus Color I"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 740"
+msgid "Epson Stylus Color II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 760"
+msgid "Epson Stylus Color IIs"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 777"
+msgid "Epson Stylus Color PRO"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 800"
+msgid "Epson Stylus Pro XL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Color 850"
+msgid "Epson Stylus Color 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Color 860"
+msgid "Epson Stylus Color 440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Color 880"
+msgid "Epson Stylus Color 460"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Color 83"
+msgid "Epson Stylus Color 480"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Color 900"
+msgid "Epson Stylus Color 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Color 980"
+msgid "Epson Stylus Color 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Color 1160"
+msgid "Epson Stylus Color 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Color 1500"
+msgid "Epson Stylus Color 640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Color 1520"
+msgid "Epson Stylus Color 660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Color 3000"
+msgid "Epson Stylus Color 670"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo"
+msgid "Epson Stylus Color 680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 700"
+msgid "Epson Stylus Color 740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo EX"
+msgid "Epson Stylus Color 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo EX3"
+msgid "Epson Stylus Color 777"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 720"
+msgid "Epson Stylus Color 800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 750"
+msgid "Epson Stylus Color 850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 780"
+msgid "Epson Stylus Color 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 785EPX"
+msgid "Epson Stylus Color 880"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 810"
+msgid "Epson Stylus Color 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 820"
+msgid "Epson Stylus Color 980"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 825"
+msgid "Epson Stylus Color 1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 890"
+msgid "Epson Stylus Photo"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 900"
+msgid "Epson Stylus Photo EX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo 935"
+msgid "Epson Stylus Photo 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 875"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo R210"
+msgid "Epson Stylus Photo 890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:267
-msgid "EPSON Stylus Photo R220"
+msgid "Epson Stylus Photo 895"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R310"
+msgid "Epson Stylus Photo 915"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:270
-msgid "EPSON Stylus Photo R320"
+msgid "Epson Stylus Photo 925"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:271
-msgid "EPSON Stylus Photo R340"
+msgid "Epson Stylus Photo 935"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Photo RX400"
+msgid "Epson Stylus Photo 950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Photo RX420"
+msgid "Epson Stylus Photo 960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Photo RX430"
+msgid "Epson Stylus Photo 1270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Photo RX500"
+msgid "Epson Stylus Photo 1280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Photo RX510"
+msgid "Epson Stylus Photo 1290"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Photo RX600"
+msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Photo RX620"
+msgid "Epson Stylus Photo 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Photo RX630"
+msgid "Epson Stylus Photo 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:281
-msgid "EPSON Stylus Photo RX700"
+msgid "Epson Stylus Photo R200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus Photo R800"
+msgid "Epson Stylus Photo R210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus Photo R1800"
+msgid "Epson Stylus Photo R220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:284
-msgid "EPSON Stylus Photo R2400"
+msgid "Epson Stylus Photo R300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX1500"
+msgid "Epson Stylus Photo RX630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX3100"
+msgid "Epson Stylus Photo RX700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON Stylus CX3200"
+msgid "Epson Stylus Photo R800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON Stylus CX3500"
+msgid "Epson Stylus Photo R1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON Stylus CX3600"
+msgid "Epson Stylus Photo R2400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON Stylus CX3650"
+msgid "Epson Stylus Pro 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:302
-msgid "EPSON Stylus CX3700"
+msgid "Epson Stylus Pro 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:303
-msgid "EPSON Stylus CX3800"
+msgid "Epson Stylus Pro 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON Stylus CX3805"
+msgid "Epson Stylus Pro 7500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON Stylus CX3810"
+msgid "Epson Stylus Pro 7600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON Stylus CX4100"
+msgid "Epson Stylus Pro 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON Stylus CX4200"
+msgid "Epson Stylus Pro 9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON Stylus CX4500"
+msgid "Epson Stylus Pro 9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX4600"
+msgid "Epson Stylus Pro 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON Stylus CX4700"
+msgid "Epson Stylus Scan 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON Stylus CX4800"
+msgid "Epson Stylus Scan 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5100"
+msgid "Epson Stylus CX1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5200"
+msgid "Epson Stylus CX3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX6500"
+msgid "Epson Stylus CX3805"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON Stylus CX7700"
+msgid "Epson Stylus CX4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON Stylus D68"
+msgid "Epson Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON Stylus D88"
+msgid "Epson Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON Stylus DX3800"
+msgid "Epson Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON Stylus DX3850"
+msgid "Epson Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON Stylus DX4250"
+msgid "Epson Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
+msgid "Epson Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
+msgid "Epson Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
+msgid "Epson Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
+msgid "Epson Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
+msgid "Epson Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON E-100"
+msgid "Epson Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
+msgid "Epson Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
+msgid "Epson Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
+msgid "Epson Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
+msgid "Epson Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
+msgid "Epson Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
+msgid "Epson Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
+msgid "Epson Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
+msgid "Epson Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
+msgid "Epson Stylus DX4250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
+msgid "Epson Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "EPSON PM-A900"
+msgid "Epson PM 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PM-D750"
+msgid "Epson PM 880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PM-D770"
+msgid "Epson PM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PM-D1000"
+msgid "Epson PM 940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PM-G700"
+msgid "Epson PM 950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PM-G720"
+msgid "Epson PM 970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "EPSON PM-G800"
+msgid "Epson PM 980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "EPSON PM-G820"
+msgid "Epson PM 2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "EPSON PX-A650"
+msgid "Epson PM 2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "EPSON PX-G900"
+msgid "Epson PM 3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "EPSON PX-G920"
+msgid "Epson PM 3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "EPSON PX-G5000"
+msgid "Epson PM 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "EPSON PX-V500"
+msgid "Epson PM 3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "EPSON PX-V600"
+msgid "Epson PM 4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "EPSON PX-5500"
+msgid "Epson PM 5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
+msgid "Epson PM 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
+msgid "Epson PM A900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
+msgid "Epson PM D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
+msgid "Epson PM D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
+msgid "Epson PM D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
+msgid "Epson PM G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
+msgid "Epson PM G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
+msgid "Epson PM G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
+msgid "Epson PM G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
+msgid "Epson PX A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
+msgid "Epson PX G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
+msgid "Epson PX G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
+msgid "Epson PX G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
+msgid "Epson PX V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
+msgid "Epson PX V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
+msgid "Epson PX 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+msgid "Generic PCL 4 Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:490
+msgid "Generic PCL 5 Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:491
+msgid "Generic PCL 5c Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:492
+msgid "Generic PCL 5e Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+msgid "HP e-printer e20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+msgid "Star LaserPrinter 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4647,78 +6399,78 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 msgid "Gutenprint"
 msgstr ""
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -4735,10 +6487,11 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -4776,13 +6529,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -4817,91 +6573,95 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr ""
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr ""
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr ""
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr ""
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -4909,82 +6669,224 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
 #, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
+#, c-format
+msgid "Status: Waiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1064
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5023,7 +6925,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5059,12 +6961,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5076,38 +6983,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5117,44 +7024,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5165,12 +7072,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5178,42 +7085,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5222,7 +7129,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5231,11 +7138,11 @@ msgstr ""
 msgid "Printing..."
 msgstr ""
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5247,113 +7154,108 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1221
-#, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr ""
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
new file mode 100644
index 0000000..43a8e86
--- /dev/null
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 0000000..583c7b1
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,7977 @@
+# Hungarian translation of gutenprint.
+# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+# Laszlo Dvornik <dvornikl@mailbox.hu>, 2004.
+# Andras Timar <timar@fsf.hu>, 2004.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gutenprint 5.0.0-b5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"PO-Revision-Date: 2006-01-22 15:47+0100\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=1; plural=0;\n"
+
+#: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1529
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: src/main/dither-main.c:47
+msgid "EvenTone"
+msgstr "Egyenletes tónus (EvenTone)"
+
+#: src/main/dither-main.c:48
+msgid "Hybrid EvenTone"
+msgstr "Hibrid egyenletes tónus (EvenTone)"
+
+#: src/main/dither-main.c:54
+msgid "EvenBetter"
+msgstr "Mégjobb"
+
+#: src/main/dither-main.c:55
+msgid "Hybrid EvenBetter"
+msgstr "Hibrid Mégjobb"
+
+#: src/main/dither-main.c:61
+msgid "UniTone"
+msgstr "UniTone"
+
+#: src/main/dither-main.c:62
+msgid "Hybrid UniTone"
+msgstr "Hibrid UniTone"
+
+#: src/main/dither-main.c:64
+msgid "Adaptive Hybrid"
+msgstr "Adaptív hibrid"
+
+#: src/main/dither-main.c:65
+msgid "Ordered"
+msgstr "Rendezett"
+
+#: src/main/dither-main.c:66
+msgid "Fast"
+msgstr "Gyors"
+
+#: src/main/dither-main.c:67
+msgid "Very Fast"
+msgstr "Nagyon gyors"
+
+#: src/main/dither-main.c:68
+msgid "Hybrid Floyd-Steinberg"
+msgstr "Floyd-Steinberg hibrid"
+
+#: src/main/dither-main.c:69
+msgid "Predithered Input"
+msgstr "Előszórt bemenet"
+
+#: src/main/dither-main.c:89 src/main/print-color.c:56
+msgid "Density"
+msgstr "Sűrűség"
+
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
+#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
+#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
+#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+msgid "Output Level Adjustment"
+msgstr "Kimeneti szint igazítása"
+
+#: src/main/dither-main.c:90
+msgid ""
+"Adjust the density (amount of ink) of the print. Reduce the density if the "
+"ink bleeds through the paper or smears; increase the density if black "
+"regions are not solid."
+msgstr ""
+"A nyomat sűrűségének (a tinta mennyiségének) beállítása. Ha a tinta átüt a "
+"papíron vagy elfolyik, akkor csökkentse a sűrűséget. Ha a fekete területek "
+"nem egyenletesek, akkor viszont növelje azt."
+
+#: src/main/dither-main.c:98
+msgid "Dither Algorithm"
+msgstr "Szórási algoritmus"
+
+#: src/main/dither-main.c:98
+msgid "Screening Adjustment"
+msgstr "Képernyőzési igazítás"
+
+#: src/main/dither-main.c:99
+msgid ""
+"Choose the dither algorithm to be used.\n"
+"Adaptive Hybrid usually produces the best all-around quality.\n"
+"EvenTone is a new, experimental algorithm that often produces excellent "
+"results.\n"
+"Ordered is faster and produces almost as good quality on photographs.\n"
+"Fast and Very Fast are considerably faster, and work well for text and line "
+"art.\n"
+"Hybrid Floyd-Steinberg generally produces inferior output."
+msgstr ""
+"Válassza ki a használandó színszórási módszert.\n"
+"�ltalában az \"adaptive hybrid\" (\"adaptív hibrid\") adja a legjobb "
+"minőséget.\n"
+"Az EvenTone egy új, kísérleti algoritmus, amely gyakran kitűnő eredményeket "
+"szolgáltat.\n"
+"Az \"ordered\" (\"rendezett\") gyorsabb, és majdnem olyan jó minőséget ad "
+"fényképek esetében.\n"
+"A \"fast\" (\"gyors\") és a \"very fast\" (\"nagyon gyors\") lényegesen "
+"gyorsabbak, és jól működnek szövegek valamint rajzok esetében.\n"
+"A \"hybrid Floyd-Steinberg\" (\"hibrid Floyd-Steinberg\") módszer általában "
+"rosszabb minőséget ad."
+
+#: src/main/module.c:52
+msgid "Miscellaneous (unclassified)"
+msgstr "Egyéb (osztályozatlan)"
+
+#: src/main/module.c:53
+msgid "Family driver"
+msgstr "Családillesztő"
+
+#: src/main/module.c:54
+msgid "Color conversion module"
+msgstr "Színátalakítási modul"
+
+#: src/main/module.c:55
+msgid "Dither algorithm"
+msgstr "Szórási algoritmus"
+
+#: src/main/print-canon.c:1382
+msgid "90x90 DPI"
+msgstr "90x90 DPI"
+
+#: src/main/print-canon.c:1382
+msgid "90x90 DPI DMT"
+msgstr "90x90 DPI DMT"
+
+#: src/main/print-canon.c:1383
+msgid "180x180 DPI"
+msgstr "180x180 DPI"
+
+#: src/main/print-canon.c:1383
+msgid "180x180 DPI DMT"
+msgstr "180x180 DPI DMT"
+
+#: src/main/print-canon.c:1384
+msgid "360x360 DPI"
+msgstr "360x360 DPI"
+
+#: src/main/print-canon.c:1384
+msgid "360x360 DPI DMT"
+msgstr "360x360 DPI DMT"
+
+#: src/main/print-canon.c:1385
+msgid "720x360 DPI"
+msgstr "720x360 DPI"
+
+#: src/main/print-canon.c:1385
+msgid "720x360 DPI DMT"
+msgstr "720x360 DPI DMT"
+
+#: src/main/print-canon.c:1386
+msgid "720x720 DPI"
+msgstr "720x720 DPI"
+
+#: src/main/print-canon.c:1386
+msgid "720x720 DPI DMT"
+msgstr "720x720 DPI DMT"
+
+#: src/main/print-canon.c:1387
+msgid "1440x720 DPI"
+msgstr "1440x720 DPI"
+
+#: src/main/print-canon.c:1387
+msgid "1440x720 DPI DMT"
+msgstr "1440x720 DPI DMT"
+
+#: src/main/print-canon.c:1388
+msgid "1440x1440 DPI"
+msgstr "1440x1440 DPI"
+
+#: src/main/print-canon.c:1388
+msgid "1440x1440 DPI DMT"
+msgstr "1440x1440 DPI DMT"
+
+#: src/main/print-canon.c:1389
+msgid "2880x2880 DPI"
+msgstr "2880x2880 DPI"
+
+#: src/main/print-canon.c:1389
+msgid "2880x2880 DPI DMT"
+msgstr "2880x2880 DPI DMT"
+
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-canon.c:1390
+msgid "150x150 DPI DMT"
+msgstr "150x150 DPI DMT"
+
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-canon.c:1391
+msgid "300x300 DPI DMT"
+msgstr "300x300 DPI DMT"
+
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-canon.c:1392
+msgid "600x300 DPI DMT"
+msgstr "600x300 DPI DMT"
+
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-canon.c:1393
+msgid "600x600 DPI DMT"
+msgstr "600x600 DPI DMT"
+
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-canon.c:1394
+msgid "1200x600 DPI DMT"
+msgstr "1200x600 DPI DMT"
+
+#: src/main/print-canon.c:1395
+msgid "1200x1200 DPI"
+msgstr "1200x1200 DPI"
+
+#: src/main/print-canon.c:1395
+msgid "1200x1200 DPI DMT"
+msgstr "1200x1200 DPI DMT"
+
+#: src/main/print-canon.c:1396
+msgid "2400x2400 DPI"
+msgstr "2400x2400 DPI"
+
+#: src/main/print-canon.c:1396
+msgid "2400x2400 DPI DMT"
+msgstr "2400x2400 DPI DMT"
+
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
+#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
+#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
+#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
+msgid "Plain Paper"
+msgstr "Egyszerű lap"
+
+#: src/main/print-canon.c:1448
+#, fuzzy
+msgid "Plain Paper PIXMA"
+msgstr "Egyszerű lap"
+
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
+#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
+#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
+#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
+msgid "Transparencies"
+msgstr "�tlátszóságok"
+
+#: src/main/print-canon.c:1450
+msgid "Back Print Film"
+msgstr "Hátulnyomásos film"
+
+#: src/main/print-canon.c:1451
+msgid "Fabric Sheets"
+msgstr "Szövet"
+
+#: src/main/print-canon.c:1452
+msgid "Envelope"
+msgstr "Boríték"
+
+#: src/main/print-canon.c:1453
+msgid "High Resolution Paper"
+msgstr "Magas felbontású papír"
+
+#: src/main/print-canon.c:1454
+msgid "T-Shirt Transfers"
+msgstr "Pólóra vasalható"
+
+#: src/main/print-canon.c:1455
+msgid "High Gloss Film"
+msgstr "Magasfényű film"
+
+#: src/main/print-canon.c:1456
+msgid "Glossy Photo Paper"
+msgstr "Fényes fotópapír"
+
+#: src/main/print-canon.c:1457
+msgid "Glossy Photo Cards"
+msgstr "Fényes fotókártya"
+
+#: src/main/print-canon.c:1458
+msgid "Photo Paper Pro"
+msgstr "Fotópapír pro"
+
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
+#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
+#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
+#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
+msgid "Other"
+msgstr "Egyéb"
+
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
+#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+msgid "Page Size"
+msgstr "Oldalméret"
+
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+msgid "Basic Printer Setup"
+msgstr "Nyomtató alapbeállításai"
+
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
+#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+msgid "Size of the paper being printed to"
+msgstr "A nyomtatáshoz használt papír mérete"
+
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+msgid "Media Type"
+msgstr "Papír típusa"
+
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
+#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr "A hordozó típusa (egyszerű lap, fotópapír, stb.)"
+
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+msgid "Media Source"
+msgstr "Papír forrása"
+
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
+#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+msgid "Source (input slot) of the media"
+msgstr "A nyomtatáshoz használt hordozó forrása"
+
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+msgid "Resolution"
+msgstr "Felbontás"
+
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
+#: src/main/print-ps.c:85
+msgid "Resolution and quality of the print"
+msgstr "A nyomtatás felbontása és minősége"
+
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
+#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+msgid "Ink Type"
+msgstr "Tinta típusa"
+
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
+#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
+#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
+#: src/main/print-ps.c:90 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Haladó nyomtatóbeállítások"
+
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
+#: src/main/print-ps.c:91 src/main/print-raw.c:81
+msgid "Type of ink in the printer"
+msgstr "A nyomtatóban levő tinta típusa"
+
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
+#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+msgid "Ink Channels"
+msgstr "Tintacsatornák"
+
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
+#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+msgid "Advanced Printer Functionality"
+msgstr "Haladó nyomtatófunkciók"
+
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
+#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+msgid "Printing Mode"
+msgstr "Nyomtatási mód"
+
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
+#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
+#: src/main/print-ps.c:102 src/main/print-raw.c:86
+msgid "Core Parameter"
+msgstr "Alap paraméter"
+
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
+#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+msgid "Printing Output Mode"
+msgstr "Nyomtatás kimeneti módja"
+
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr "Kétoldalas nyomtatás"
+
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr "Kétoldalas/fordítva beállítás"
+
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+msgid "Cyan Density"
+msgstr "Ciánkék sűrűsége"
+
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+msgid "Adjust the cyan density"
+msgstr "A nyomat ciánkék-sűrűségének beállítása"
+
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+msgid "Magenta Density"
+msgstr "Bíborvörös sűrűsége"
+
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+msgid "Adjust the magenta density"
+msgstr "A nyomat bíborvörös-sűrűségének beállítása"
+
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+msgid "Yellow Density"
+msgstr "Sárga sűrűsége"
+
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+msgid "Adjust the yellow density"
+msgstr "A nyomat sárga-sűrűségének beállítása"
+
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+msgid "Black Density"
+msgstr "Fekete sűrűsége"
+
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+msgid "Adjust the black density"
+msgstr "A nyomat fekete-sűrűségének beállítása"
+
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+msgid "Light Cyan Transition"
+msgstr "Világos ciánkék átmenet"
+
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
+#: src/main/print-pcl.c:1258
+msgid "Advanced Ink Adjustment"
+msgstr "Haladó tintabeállítás"
+
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+msgid "Light Magenta Transition"
+msgstr "Világos bíborvörös átmenet"
+
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+msgid "Light Yellow Transition"
+msgstr "Világossárga átmenet"
+
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+msgid "Off"
+msgstr "Kikapcsolva"
+
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr "Rövidebbik él (tükrözve)"
+
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatikus lapadagoló"
+
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Kézzel szünetekkel"
+
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Kézzel szünetek nélkül"
+
+#: src/main/print-canon.c:1923
+#, fuzzy
+msgid "Cassette"
+msgstr "Matt"
+
+#: src/main/print-canon.c:1924
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Fotó CcMmYK szín"
+
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Fotó CcMmY szín"
+
+#: src/main/print-canon.c:2055
+msgid "CMYK Color"
+msgstr "CMYK szín"
+
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY szín"
+
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Fekete"
+
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+msgid "Color"
+msgstr "Színes"
+
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
+#: src/main/print-ps.c:169 src/main/print-raw.c:137
+msgid "Black and White"
+msgstr "Fekete-fehér"
+
+#: src/main/print-color.c:50
+msgid "High Accuracy"
+msgstr "Nagy pontosság"
+
+#: src/main/print-color.c:51
+msgid "Bright Colors"
+msgstr "Világos színek"
+
+#: src/main/print-color.c:52
+msgid "Correct Hue Only"
+msgstr "Csak az árnyalat javítása"
+
+#: src/main/print-color.c:53
+msgid "Uncorrected"
+msgstr "Javítatlan"
+
+#: src/main/print-color.c:54
+msgid "Desaturated"
+msgstr "Telítetlen"
+
+#: src/main/print-color.c:55
+msgid "Threshold"
+msgstr "Küszöb"
+
+#: src/main/print-color.c:57 src/main/print-color.c:133
+msgid "Raw"
+msgstr "Nyers"
+
+#: src/main/print-color.c:58
+msgid "Pre-Dithered"
+msgstr "Előszórt"
+
+#: src/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+msgid "Grayscale"
+msgstr "Szürkeárnyalatos"
+
+#: src/main/print-color.c:123
+msgid "Whitescale"
+msgstr "Fehérárnyalatos"
+
+#: src/main/print-color.c:125
+msgid "RGB"
+msgstr "RGB"
+
+#: src/main/print-color.c:127
+msgid "CMY"
+msgstr "CMY"
+
+#: src/main/print-color.c:129
+msgid "CMYK"
+msgstr "CMYK"
+
+#: src/main/print-color.c:131
+msgid "KCMY"
+msgstr "KCMY"
+
+#: src/main/print-color.c:165 src/main/print-color.c:446
+msgid "Channel "
+msgstr "Csatorna "
+
+#: src/main/print-color.c:165
+msgid " Gamma"
+msgstr " Gamma"
+
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/main/print-color.c:166
+msgid "Gamma for raw channel "
+msgstr "A nyers csatorna gamma értéke "
+
+#: src/main/print-color.c:176
+msgid "Color Correction"
+msgstr "Színkorrekció"
+
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
+#: src/main/generic-options.c:68
+msgid "Basic Image Adjustment"
+msgstr "Alap képigazítás"
+
+#: src/main/print-color.c:177
+msgid "Color correction to be applied"
+msgstr "Alkalmazandó színkorrekció"
+
+#: src/main/print-color.c:184
+msgid "Channel Bit Depth"
+msgstr "Csatorna bitmélysége"
+
+#: src/main/print-color.c:185
+msgid "Bit depth per channel"
+msgstr "Csatornánkénti bitmélység"
+
+#: src/main/print-color.c:192
+msgid "Input Image Type"
+msgstr "Bemeneti képtípus"
+
+#: src/main/print-color.c:193
+msgid "Input image type"
+msgstr "Bemeneti kép típusa"
+
+#: src/main/print-color.c:200
+msgid "Output Image Type"
+msgstr "Kimeneti képtípus"
+
+#: src/main/print-color.c:201
+msgid "Output image type"
+msgstr "Kimeneti kép típusa"
+
+#: src/main/print-color.c:208 src/main/print-color.c:209
+#: src/main/print-escp2.c:326
+msgid "Raw Channels"
+msgstr "Nyers csatornák"
+
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Alkalmazás Gamma"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
+msgid "Brightness"
+msgstr "Fényesség"
+
+#: src/main/print-color.c:225
+msgid "Brightness of the print"
+msgstr "A nyomat fényessége"
+
+#: src/main/print-color.c:232
+msgid "Contrast"
+msgstr "Kontraszt"
+
+#: src/main/print-color.c:233
+msgid "Contrast of the print (0 is solid gray)"
+msgstr "A nyomat kontrasztja (0= tömör szürke)"
+
+#: src/main/print-color.c:240
+msgid "Linear Contrast Adjustment"
+msgstr "Lineáris kontrasztigazítás"
+
+#: src/main/print-color.c:240
+msgid "Advanced Image Control"
+msgstr "Haladó képvezérlés"
+
+#: src/main/print-color.c:241
+msgid "Use linear vs. fixed end point contrast adjustment"
+msgstr "Lineáris vagy rögzített végpontú kontrasztigazítás használata"
+
+#: src/main/print-color.c:248
+msgid "Composite Gamma"
+msgstr "Összetett gamma"
+
+#: src/main/print-color.c:249
+msgid ""
+"Adjust the gamma of the print. Larger values will produce a generally "
+"brighter print, while smaller values will produce a generally darker print. "
+msgstr ""
+"A nyomat gamma értékének beállítása. A nagyobb értékek fényesebb nyomatot "
+"eredményeznek, a kisebbek pedig sötétebbet. "
+
+#: src/main/print-color.c:258
+msgid "AppGamma"
+msgstr "Alkalmazás Gamma"
+
+#: src/main/print-color.c:259
+msgid "Gamma value assumed by application"
+msgstr "Az alkalmazás által feltételezett gamma érték"
+
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
+msgid "Cyan"
+msgstr "Ciánkék"
+
+#: src/main/print-color.c:267
+msgid "Adjust the cyan gamma"
+msgstr "A ciánkék gamma értékének beállítása"
+
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
+msgid "Magenta"
+msgstr "Bíborvörös"
+
+#: src/main/print-color.c:275
+msgid "Adjust the magenta gamma"
+msgstr "A bíborvörös gamma értékének beállítása"
+
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
+msgid "Yellow"
+msgstr "Sárga"
+
+#: src/main/print-color.c:283
+msgid "Adjust the yellow gamma"
+msgstr "A sárga gamma értékének beállítása"
+
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
+msgid "Red"
+msgstr "Vörös"
+
+#: src/main/print-color.c:291
+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:2159
+#: src/gutenprintui2/panel.c:2158
+msgid "Green"
+msgstr "Zöld"
+
+#: src/main/print-color.c:299
+msgid "Adjust the green gamma"
+msgstr "A zöld gamma értékének beállítása"
+
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
+msgid "Blue"
+msgstr "Kék"
+
+#: src/main/print-color.c:307
+msgid "Adjust the blue gamma"
+msgstr "A kék gamma értékének beállítása"
+
+#: src/main/print-color.c:315
+msgid "Adjust the black gamma"
+msgstr "A fekete gamma értékének beállítása"
+
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+msgid "Cyan Balance"
+msgstr "Ciánkékegyensúly"
+
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
+msgid "GrayBalance"
+msgstr "Szürkeegyensúly"
+
+#: src/main/print-color.c:323
+msgid "Adjust the cyan gray balance"
+msgstr "A ciánkék szürkeegyensúlyának beállítása"
+
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+msgid "Magenta Balance"
+msgstr "Bíborvörös-egyensúly"
+
+#: src/main/print-color.c:331
+msgid "Adjust the magenta gray balance"
+msgstr "A bíborvörös szürkeegyensúlyának beállítása"
+
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+msgid "Yellow Balance"
+msgstr "Sárgaegyensúly"
+
+#: src/main/print-color.c:339
+msgid "Adjust the yellow gray balance"
+msgstr "A sárga szürkeegyensúlyának beállítása"
+
+#: src/main/print-color.c:346
+msgid "Saturation"
+msgstr "Telítettség"
+
+#: src/main/print-color.c:347
+msgid ""
+"Adjust the saturation (color balance) of the print\n"
+"Use zero saturation to produce grayscale output using color and black inks"
+msgstr ""
+"A nyomat telítettségének (színegyensúlyának) beállítása.\n"
+"Ha színes és fekete tintával szürkeárnyalatos nyomtatást szeretne végezni, "
+"akkor adjon meg 0 értéket."
+
+#: src/main/print-color.c:357
+msgid "Ink Limit"
+msgstr "Tintakorlát"
+
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+msgid "Advanced Output Control"
+msgstr "Haladó kimenetvezérlés"
+
+#: src/main/print-color.c:358
+msgid "Limit the total ink printed to the page"
+msgstr "Az oldalra összesen kinyomtatott tinta korlátozása"
+
+#: src/main/print-color.c:365
+msgid "GCR Transition"
+msgstr "GCR áttérés"
+
+#: src/main/print-color.c:366
+msgid "Adjust the gray component transition rate"
+msgstr "A szürkeösszetevő áttérési sebességének beállítása"
+
+#: src/main/print-color.c:373
+msgid "GCR Lower Bound"
+msgstr "GCR alsó korlát"
+
+#: src/main/print-color.c:374
+msgid "Lower bound of gray component reduction"
+msgstr "A szürkeösszetevő csökkentésének alsó korlátja"
+
+#: src/main/print-color.c:381
+msgid "GCR Upper Bound"
+msgstr "GCR felső korlát"
+
+#: src/main/print-color.c:382
+msgid "Upper bound of gray component reduction"
+msgstr "A szürkeösszetevő csökkentésének felső korlátja"
+
+#: src/main/print-color.c:446
+msgid " Curve"
+msgstr " Görbe"
+
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
+msgid "Output Curves"
+msgstr "Kimeneti görbék"
+
+#: src/main/print-color.c:447
+msgid "Curve for raw channel "
+msgstr "A nyers csatorna görbéje "
+
+#: src/main/print-color.c:457
+msgid "Cyan Curve"
+msgstr "Ciánkék görbe"
+
+#: src/main/print-color.c:458
+msgid "Cyan curve"
+msgstr "Ciánkék görbe"
+
+#: src/main/print-color.c:465
+msgid "Magenta Curve"
+msgstr "Bíborvörös görbe"
+
+#: src/main/print-color.c:466
+msgid "Magenta curve"
+msgstr "Bíborvörös görbe"
+
+#: src/main/print-color.c:473
+msgid "Yellow Curve"
+msgstr "Sárga görbe"
+
+#: src/main/print-color.c:474
+msgid "Yellow curve"
+msgstr "Sárga görbe"
+
+#: src/main/print-color.c:481
+msgid "Black Curve"
+msgstr "Fekete görbe"
+
+#: src/main/print-color.c:482
+msgid "Black curve"
+msgstr "Fekete görbe"
+
+#: src/main/print-color.c:489
+msgid "Red Curve"
+msgstr "Vörös görbe"
+
+#: src/main/print-color.c:490
+msgid "Red curve"
+msgstr "Vörös görbe"
+
+#: src/main/print-color.c:497
+msgid "Green Curve"
+msgstr "Zöld görbe"
+
+#: src/main/print-color.c:498
+msgid "Green curve"
+msgstr "Zöld görbe"
+
+#: src/main/print-color.c:505
+msgid "Blue Curve"
+msgstr "Kék görbe"
+
+#: src/main/print-color.c:506
+msgid "Blue curve"
+msgstr "Kék görbe"
+
+#: src/main/print-color.c:513
+msgid "White Curve"
+msgstr "Fehér görbe"
+
+#: src/main/print-color.c:514
+msgid "White curve"
+msgstr "Fehér görbe"
+
+#: src/main/print-color.c:521
+msgid "Hue Map"
+msgstr "�rnyalattérkép"
+
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
+msgid "Advanced HSL Curves"
+msgstr "Haladó HSL görbék"
+
+#: src/main/print-color.c:522
+msgid "Hue adjustment curve"
+msgstr "�rnyalatbeállítási görbe"
+
+#: src/main/print-color.c:529
+msgid "Saturation Map"
+msgstr "Telítettségtérkép"
+
+#: src/main/print-color.c:530
+msgid "Saturation adjustment curve"
+msgstr "Telítettségbeállítási görbe"
+
+#: src/main/print-color.c:537
+msgid "Luminosity Map"
+msgstr "Fényességtérkép"
+
+#: src/main/print-color.c:538
+msgid "Luminosity adjustment curve"
+msgstr "Fényességbeállítási görbe"
+
+#: src/main/print-color.c:545
+msgid "Gray Component Reduction"
+msgstr "Szürkeösszetevő-csökkentés (GCR)"
+
+#: src/main/print-color.c:546
+msgid "Gray component reduction curve"
+msgstr "Szürkeösszetevő-csökkentési görbe"
+
+#: src/main/print-color.c:1668
+msgid "Traditional Gutenprint color conversion"
+msgstr "Hagyományos Gutenprint színátalakítás"
+
+#: src/main/printers.c:503
+#, c-format
+msgid "Value must be set for %s\n"
+msgstr "A(z) %s számára be kell állítani egy értéket\n"
+
+#: src/main/printers.c:516 src/main/printers.c:521
+#, c-format
+msgid "`%s' is not a valid %s\n"
+msgstr "\"%s\" nem érvényes %s\n"
+
+#: src/main/printers.c:540
+#, c-format
+msgid "%s must be between %f and %f (is %f)\n"
+msgstr "A(z) %s %f és %f között kell legyen (jelenleg %f)\n"
+
+#: src/main/printers.c:562 src/main/printers.c:586
+#, c-format
+msgid "%s must be between %d and %d (is %d)\n"
+msgstr "A(z) %s %d és %d között kell legyen (jelenleg %d)\n"
+
+#: src/main/printers.c:617
+#, c-format
+msgid "%s bounds must be between %f and %f\n"
+msgstr "A(z) %s határainak %f és %f között kell lenniük\n"
+
+#: src/main/printers.c:625
+#, c-format
+msgid "%s wrap mode must be %s\n"
+msgstr "A(z) %s tördelési módja a következő kell legyen: %s\n"
+
+#: src/main/printers.c:629
+msgid "no wrap"
+msgstr "nincs tördelés"
+
+#: src/main/printers.c:629
+msgid "wrap around"
+msgstr "tördelés"
+
+#: src/main/printers.c:673
+#, c-format
+msgid "Unknown type parameter %s (%d)\n"
+msgstr "Ismeretlen típusú paraméter: %s (%d)\n"
+
+#: src/main/printers.c:686 src/main/printers.c:697
+#, c-format
+msgid "%s out of range (value %d, min %d, max %d)\n"
+msgstr "A(z) %s kívül esik a tartományon (érték: %d, min.: %d, max.: %d)\n"
+
+#: src/main/printers.c:755
+msgid "Page size is not valid\n"
+msgstr "Érvénytelen oldalméret\n"
+
+#: src/main/printers.c:776
+#, c-format
+msgid "Top margin must not be less than %d\n"
+msgstr "A felső szegély kevesebb kell legyen, mint %d\n"
+
+#: src/main/printers.c:782
+#, c-format
+msgid "Left margin must not be less than %d\n"
+msgstr "A bal szegély nem lehet kevesebb, mint %d\n"
+
+#: src/main/printers.c:788
+msgid "Height must be greater than zero\n"
+msgstr "A magasság nullánál nagyobb kell legyen\n"
+
+#: src/main/printers.c:794
+msgid "Width must be greater than zero\n"
+msgstr "A szélesség nullánál nagyobb kell legyen\n"
+
+#: src/main/printers.c:800
+#, c-format
+msgid ""
+"Image is too wide for the page: left margin is %d, width %d, right edge is %"
+"d\n"
+msgstr ""
+"A kép túl széles az oldalhoz: a bal margó %d, a szélesség %d, a jobb szél %"
+"d\n"
+
+#: src/main/printers.c:807
+#, c-format
+msgid ""
+"Image is too long for the page: top margin is %d, height %d, bottom edge is %"
+"d\n"
+msgstr ""
+"A kép túl magas az oldalhoz: a felső margó %d, a magasság %d, az alsó szél %"
+"d\n"
+
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+msgid "Standard"
+msgstr "Szabványos"
+
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
+msgid "Roll Feed"
+msgstr "Tekercses adagoló"
+
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+msgid "Roll Feed (cut each page)"
+msgstr "Tekercses adagoló (levágás minden lap után)"
+
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+msgid "Roll Feed (do not cut)"
+msgstr "Tekercses adagoló (levágás nélkül)"
+
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+msgid "Manual Feed"
+msgstr "Kézi adagolás"
+
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+msgid "Print to CD"
+msgstr "Nyomtatás CD-re"
+
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Kézi kijelölés"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Kézi adagolás"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Tálca"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotófekete"
+
+#: src/main/print-escp2-data.c:619
+msgid "Cut Sheet Bin 1"
+msgstr "Vágólap, 1. tálca"
+
+#: src/main/print-escp2-data.c:628
+msgid "Cut Sheet Bin 2"
+msgstr "Vágólap, 2. tálca"
+
+#: src/main/print-escp2-data.c:637
+msgid "Cut Sheet Autoselect"
+msgstr "Vágólap, automatikus tálcaválasztás"
+
+#: src/main/print-escp2-data.c:646
+msgid "Manual Selection"
+msgstr "Kézi kijelölés"
+
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Gyors, gazdaságos"
+
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Gazdaságos"
+
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Piszkozat"
+
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+msgid "High"
+msgstr "Magas"
+
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Fotó"
+
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Szuper fotó"
+
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra fotó"
+
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Legjobb"
+
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+msgid "Light Cyan"
+msgstr "Világos ciánkék"
+
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+msgid "Light Magenta"
+msgstr "Világos bíborvörös"
+
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
+msgid "Light Black"
+msgstr "Világos fekete"
+
+#: src/main/print-escp2-data.c:810
+msgid "Dark Yellow"
+msgstr "Sötétsárga"
+
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+msgid "Matte Black"
+msgstr "Matt fekete"
+
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+msgid "Photo Black"
+msgstr "Fotófekete"
+
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+msgid "Gloss Optimizer"
+msgstr "Fényességoptimalizáló"
+
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Világos fekete"
+
+#: src/main/print-escp2.c:159
+msgid "Automatic Printing Mode"
+msgstr "Automatikus nyomtatási mód"
+
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Alap kimenetvezérlés"
+
+#: src/main/print-escp2.c:160
+msgid "Automatic printing mode"
+msgstr "Automatikus nyomtatási mód"
+
+#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Nyomtatási minőség"
+
+#: src/main/print-escp2.c:195
+msgid "CD Hub Size"
+msgstr "CD középpontjának mérete"
+
+#: src/main/print-escp2.c:196
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Csak a CD középpontján kívülre nyomtatás, vagy a lyuk felé vezető úton"
+
+#: src/main/print-escp2.c:201
+msgid "CD Horizontal Fine Adjustment"
+msgstr "CD vízszintes finomhangolása"
+
+#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Finomhangolás a vízszintes pozícióig a CD-re nyomtatáshoz"
+
+#: src/main/print-escp2.c:207
+msgid "CD Vertical Fine Adjustment"
+msgstr "CD függőleges finomhangolása"
+
+#: src/main/print-escp2.c:214
+msgid "Resolution of the print"
+msgstr "A nyomat felbontása"
+
+#: src/main/print-escp2.c:230
+msgid "Enhanced Gloss"
+msgstr "Kiterjesztett fényesség"
+
+#: src/main/print-escp2.c:231
+msgid "Add gloss enhancement"
+msgstr "Fényességkiterjesztés hozzáadása"
+
+#: src/main/print-escp2.c:236
+msgid "Ink Set"
+msgstr "Tintakészlet"
+
+#: src/main/print-escp2.c:242
+msgid "Printing Direction"
+msgstr "Nyomtatás iránya"
+
+#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+msgid "Advanced Output Adjustment"
+msgstr "Haladó kimenetvezérlés"
+
+#: src/main/print-escp2.c:243
+msgid "Printing direction (unidirectional is higher quality, but slower)"
+msgstr "Nyomtatás iránya (az egyirányú jobb minőségű, de lassabb)"
+
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+msgid "Borderless"
+msgstr "Szegély nélküli"
+
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+msgid "Print without borders"
+msgstr "Nyomtatás szegélyek nélkül"
+
+#: src/main/print-escp2.c:254
+msgid "Interleave Method"
+msgstr "Kihagyási módszer"
+
+#: src/main/print-escp2.c:255
+msgid "Interleave pattern to use"
+msgstr "A használandó kihagyásminta"
+
+#: src/main/print-escp2.c:260
+msgid "Adjust dot size as necessary"
+msgstr "Hangolja szükség szerint a pontméretet"
+
+#: src/main/print-escp2.c:261
+msgid "Adjust dot size as necessary to achieve desired density"
+msgstr "Hangolja szükség szerint a pontméretet a kívánt sűrűség eléréséhez"
+
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+msgid "Output Order"
+msgstr "Kimeneti sorrend"
+
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+msgid "Alignment Passes"
+msgstr "Igazítási lépések"
+
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+msgid "Alignment Choices"
+msgstr "Igazítási lehetőségek"
+
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+msgid "Ink change command"
+msgstr "Tintacsere parancsa"
+
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+msgid "Alternate Alignment Passes"
+msgstr "Alternatív igazítási lépések"
+
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
+#: src/main/print-escp2.c:303
+msgid "Alternate Alignment Choices"
+msgstr "Alternatív igazítási lehetőségek"
+
+#: src/main/print-escp2.c:302
+msgid "Supports Packet Mode"
+msgstr "Támogatja a csomag módot"
+
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+msgid "Channel Names"
+msgstr "Csatornanevek"
+
+#: src/main/print-escp2.c:327
+msgid "Raw Channel Count"
+msgstr "Nyers csatornaszám"
+
+#: src/main/print-escp2.c:332
+msgid "Cyan Map"
+msgstr "Ciánkék-leképezés"
+
+#: src/main/print-escp2.c:333
+msgid "Adjust the cyan map"
+msgstr "A ciánkék-leképezés beállítása"
+
+#: src/main/print-escp2.c:338
+msgid "Magenta Map"
+msgstr "Bíborvörös-leképezés"
+
+#: src/main/print-escp2.c:339
+msgid "Adjust the magenta map"
+msgstr "A bíborvörös-leképezés beállítása"
+
+#: src/main/print-escp2.c:344
+msgid "Yellow Map"
+msgstr "Sárga-leképezés"
+
+#: src/main/print-escp2.c:345
+msgid "Adjust the yellow map"
+msgstr "A sárga-leképezés beállítása"
+
+#: src/main/print-escp2.c:350
+msgid "Blue Map"
+msgstr "Kék-leképezés"
+
+#: src/main/print-escp2.c:351
+msgid "Adjust the blue map"
+msgstr "A kék-leképezés beállítása"
+
+#: src/main/print-escp2.c:356
+msgid "Red Map"
+msgstr "Vörös-leképezés"
+
+#: src/main/print-escp2.c:357
+msgid "Adjust the red map"
+msgstr "A vörös-leképezés beállítása"
+
+#: src/main/print-escp2.c:445
+msgid "Red Density"
+msgstr "Vörös sűrűsége"
+
+#: src/main/print-escp2.c:446
+msgid "Adjust the red density"
+msgstr "A vörös sűrűségének beállítása"
+
+#: src/main/print-escp2.c:453
+msgid "Blue Density"
+msgstr "Kék sűrűsége"
+
+#: src/main/print-escp2.c:454
+msgid "Adjust the blue density"
+msgstr "A kék sűrűségének beállítása"
+
+#: src/main/print-escp2.c:461
+msgid "Gloss Level"
+msgstr "Fényesség szintje"
+
+#: src/main/print-escp2.c:462
+msgid "Adjust the gloss level"
+msgstr "A fényesség szintjének beállítása"
+
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+msgid "Dark Yellow Transition"
+msgstr "Sötétsárga átmenet"
+
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+msgid "Gray Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+msgid "Light Gray Transition"
+msgstr "Világosszürke-átmenet"
+
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+msgid "Dark Gray Transition"
+msgstr "Sötétszürke-átmenet"
+
+#: src/main/print-escp2.c:517
+msgid "Mid Gray Transition"
+msgstr "Középsőszürke-átmenet"
+
+#: src/main/print-escp2.c:518
+msgid "Medium Gray Transition"
+msgstr "Közepesszürke-átmenet"
+
+#: src/main/print-escp2.c:1445
+msgid "Full Manual Control"
+msgstr "Teljesen kézi vezérlés"
+
+#: src/main/print-escp2.c:1447
+msgid "Automatic Setting Control"
+msgstr "Automatikus beállításvezérlés"
+
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "5 hüvelykes CD"
+
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "3 hüvelykes CD"
+
+#: src/main/print-escp2.c:1482
+msgid "Normal"
+msgstr "Normál"
+
+#: src/main/print-escp2.c:1484
+msgid "Print To Hub"
+msgstr "Nyomtatás a középpontig"
+
+#: src/main/print-escp2.c:1509 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:1619 src/cups/genppd.c:1333
+msgid "Automatic"
+msgstr "Automatikus"
+
+#: src/main/print-escp2.c:1621
+msgid "Bidirectional"
+msgstr "Kétirányú"
+
+#: src/main/print-escp2.c:1623
+msgid "Unidirectional"
+msgstr "Egyirányú"
+
+#: src/main/print-escp2.c:1654
+msgid "Alternate Fill"
+msgstr "Alternatív kitöltés"
+
+#: src/main/print-escp2.c:1656
+msgid "Ascending Fill"
+msgstr "Növekvő kitöltés"
+
+#: src/main/print-escp2.c:1658
+msgid "Descending Fill"
+msgstr "Csökkenő kitöltés"
+
+#: src/main/print-escp2.c:1660
+msgid "Ascending Double"
+msgstr "Növekvő dupla"
+
+#: src/main/print-escp2.c:1662
+msgid "Nearest Neighbor Avoidance"
+msgstr "Legközelebbi szomszéd elkerülése"
+
+#: src/main/print-escp2.c:2087
+#, 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:3051 src/main/print-olympus.c:1774
+#: 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"
+
+#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
+msgid "300 DPI x 600 DPI"
+msgstr "300 DPI x 600 DPI"
+
+#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
+msgid "600 DPI"
+msgstr "600 DPI"
+
+#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
+msgid "600 DPI high quality"
+msgstr "600 DPI jó minőségű"
+
+#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
+msgid "600 DPI Unidirectional"
+msgstr "600 dpi (egyirányú)"
+
+#: src/main/print-lexmark.c:581 src/main/print-lexmark.c:657
+msgid "1200 DPI"
+msgstr "1200 DPI"
+
+#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
+msgid "1200 DPI high quality"
+msgstr "1200 DPI jó minőségű"
+
+#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
+msgid "1200 DPI highest quality"
+msgstr "1200 DPI legjobb minőségű"
+
+#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
+msgid "1200 DPI  Unidirectional"
+msgstr "1200 dpi (egyirányú)"
+
+#: src/main/print-lexmark.c:585
+msgid "2400 DPI x 1200 DPI"
+msgstr "2400 DPI x 1200 DPI"
+
+#: src/main/print-lexmark.c:586
+msgid "2400 DPI x 1200 DPI high quality"
+msgstr "2400 DPI x 1200 DPI jó minőségű"
+
+#: src/main/print-lexmark.c:587
+msgid "2400 DPI x 1200 DPI highest quality"
+msgstr "2400 DPI x 1200 DPI legjobb minőségű"
+
+#: src/main/print-lexmark.c:589
+msgid "test print"
+msgstr "próbanyomtatás"
+
+#: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+msgid "Four Color Standard"
+msgstr "Négyszínű szabvány"
+
+#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
+msgid "Three Color Composite"
+msgstr "Háromszínű kompozit"
+
+#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
+msgid "Six Color Photo"
+msgstr "Hatszínes fénykép"
+
+#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+msgid "Five Color Photo Composite"
+msgstr "Ötszínes fénykép (kompozit)"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
+#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
+#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
+#: src/main/escp2-papers.c:1394
+msgid "Glossy Film"
+msgstr "Fényes film"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
+msgid "Envelopes"
+msgstr "Borítékok"
+
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
+msgid "Matte Paper"
+msgstr "Matt papír"
+
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
+msgid "Inkjet Paper"
+msgstr "Inkjet papír"
+
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
+msgid "Photo Quality Inkjet Paper"
+msgstr "Fotó minőségű Inkjet papír"
+
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
+msgid "Photo Paper"
+msgstr "Fotópapír"
+
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+msgid "Premium Glossy Photo Paper"
+msgstr "Kiváló minőségű fényes fotópapír"
+
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
+msgid "Premium Luster Photo Paper"
+msgstr "Premium Luster fotópapír"
+
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
+msgid "Photo Quality Glossy Paper"
+msgstr "Fotó minőségű fényes papír"
+
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
+msgid "Ilford Heavy Paper"
+msgstr "Ilford-féle nehéz papír"
+
+#: src/main/print-olympus.c:265
+msgid "Coated"
+msgstr "Bevont"
+
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
+msgid "None"
+msgstr "Nincs"
+
+#: src/main/print-olympus.c:859
+msgid "Glossy"
+msgstr "Fényes"
+
+#: src/main/print-olympus.c:860
+msgid "Texture"
+msgstr "Textúra"
+
+#: src/main/print-olympus.c:861
+msgid "Matte"
+msgstr "Matt"
+
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+msgid "Laminate Pattern"
+msgstr "Laminált minta"
+
+#: src/main/print-olympus.c:1331
+msgid "Adjust the cyan balance"
+msgstr "A ciánkék-egyensúly beállítása"
+
+#: src/main/print-olympus.c:1339
+msgid "Adjust the magenta balance"
+msgstr "A bíborvörös-egyensúly beállítása"
+
+#: src/main/print-olympus.c:1347
+msgid "Adjust the yellow balance"
+msgstr "A sárgaegyensúly beállítása"
+
+#: src/main/print-olympus.c:1354
+msgid "Black Balance"
+msgstr "Feketeegyensúly"
+
+#: src/main/print-olympus.c:1355
+msgid "Adjust the black balance"
+msgstr "A feketeegyensúly beállítása"
+
+#: src/main/print-pcl.c:182
+msgid "Plain"
+msgstr "Egyszerű"
+
+#: src/main/print-pcl.c:183
+msgid "Bond"
+msgstr "Bond"
+
+#: src/main/print-pcl.c:184
+msgid "Premium"
+msgstr "Kiváló minőségű"
+
+#: src/main/print-pcl.c:185
+msgid "Glossy Photo"
+msgstr "Fényes fotó"
+
+#: src/main/print-pcl.c:186
+msgid "Transparency"
+msgstr "�tlátszóság"
+
+#: src/main/print-pcl.c:187
+msgid "Quick-dry Photo"
+msgstr "Gyorsan száradó fénykép"
+
+#: src/main/print-pcl.c:188
+msgid "Quick-dry Transparency"
+msgstr "Gyorsan száradó fólia"
+
+#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+msgid "Manual"
+msgstr "Kézi"
+
+#: src/main/print-pcl.c:230
+msgid "Tray 1"
+msgstr "1. tálca"
+
+#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+msgid "Tray 2"
+msgstr "2. tálca"
+
+#: src/main/print-pcl.c:232
+msgid "Tray 3"
+msgstr "3. tálca"
+
+#: src/main/print-pcl.c:233
+msgid "Tray 4"
+msgstr "4. tálca"
+
+#: src/main/print-pcl.c:234
+msgid "Portable Sheet Feeder"
+msgstr "Hordozható lapadagoló"
+
+#: src/main/print-pcl.c:235
+msgid "Desktop Sheet Feeder"
+msgstr "Asztali lapadagoló"
+
+#: src/main/print-pcl.c:236
+msgid "Tray"
+msgstr "Tálca"
+
+#: src/main/print-pcl.c:238
+msgid "Optional Source"
+msgstr "Opcionális forrás"
+
+#: src/main/print-pcl.c:239
+msgid "Autoselect"
+msgstr "Automatikus választás"
+
+#: src/main/print-pcl.c:256
+msgid "600x600 DPI monochrome"
+msgstr "600x600 DPI fekete-fehér"
+
+#: src/main/print-pcl.c:259
+msgid "2400x600 DPI"
+msgstr "2400x600 DPI"
+
+#: src/main/print-pcl.c:1427
+msgid "Color + Black Cartridges"
+msgstr "Színes + fekete patron"
+
+#: src/main/print-pcl.c:1428
+msgid "Color + Photo Cartridges"
+msgstr "Színes + fotó patronok"
+
+#: src/main/print-pcl.c:1440
+msgid "Long Edge (Standard)"
+msgstr "hosszabbik él (szabvány)"
+
+#: src/main/print-ps.c:96
+msgid "PPDFile"
+msgstr "PPD fájl"
+
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
+msgid "PPD File"
+msgstr "PPD fájl"
+
+#: src/main/print-raw.c:223
+msgid "Image dimensions must match paper dimensions"
+msgstr "A kép méretének meg kell felelnie a papír méretének"
+
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+msgid "Two Level Grayscale"
+msgstr "Kétszintű szürkeárnyalatos"
+
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Kétszintű szürkeárnyalatos"
+
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+msgid "Quadtone"
+msgstr "Quadtone"
+
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+msgid "Six Color Enhanced Composite"
+msgstr "Hatszínes (továbbfejlesztett, kompozit)"
+
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+msgid "Seven Color Photo"
+msgstr "Hétszínes fénykép"
+
+#: src/main/escp2-channels.c:1498
+msgid "Seven Color Enhanced"
+msgstr "Hétszínes (továbbfejlesztett)"
+
+#: src/main/escp2-channels.c:1535
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Hatszínes fénykép"
+
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+msgid "One Color Raw"
+msgstr "Egyszínű nyers"
+
+#: src/main/escp2-channels.c:1695
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
+
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+msgid "Two Color Raw"
+msgstr "Kétszínű nyers"
+
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
+msgid "Three Color Raw"
+msgstr "Háromszínű nyers"
+
+#: src/main/escp2-channels.c:1762
+msgid "Three Color Raw Gloss"
+msgstr "Háromszínű nyers fényes"
+
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+msgid "Four Color Raw"
+msgstr "Négyszínű nyers"
+
+#: src/main/escp2-channels.c:1884
+msgid "Four Color Raw Gloss"
+msgstr "Négyszínű nyers fényes"
+
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+msgid "Five Color Raw"
+msgstr "Ötszínes nyers"
+
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+msgid "Six Color Raw"
+msgstr "Hatszínes nyers"
+
+#: src/main/escp2-channels.c:1962
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Hatszínes továbbfejlesztett, fényes nyers"
+
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
+msgid "Seven Color Raw"
+msgstr "Hétszínes nyers"
+
+#: src/main/escp2-channels.c:2024
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Hétszínes továbbfejlesztett, fényes nyers"
+
+#: src/main/escp2-channels.c:2042
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Hatszínes nyers"
+
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+msgid "EPSON Standard Inks"
+msgstr "EPSON szabvány tinták"
+
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+msgid "UltraChrome Photo Black"
+msgstr "UltraChrome fotó fekete"
+
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+msgid "UltraChrome Matte Black"
+msgstr "UltraChrome matt fekete"
+
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+msgid "Plain Paper Fast Load"
+msgstr "Egyszerű papír, gyors betöltéssel"
+
+#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
+#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
+#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/xmli18n-tmp.h:5
+msgid "Postcard"
+msgstr "Levelezőlap"
+
+#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
+#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
+#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+msgid "Back Light Film"
+msgstr "Hátulról megvilágított film"
+
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+msgid "Matte Paper Heavyweight"
+msgstr "Matt papír, nehéz"
+
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+msgid "Premium Semigloss Photo Paper"
+msgstr "Kiváló minőségű félig fényes fotópapír"
+
+#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
+#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
+#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+msgid "ColorLife Paper"
+msgstr "ColorLife papír"
+
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
+msgid "Archival Matte Paper"
+msgstr "Archiválási matt papír"
+
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
+msgid "Watercolor Paper - Radiant White"
+msgstr "Vízfesték papír - Ragyogó fehér"
+
+#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+msgid "360 x 90 DPI Fast Economy"
+msgstr "360 x 90 DPI Gyors, gazdaságos"
+
+#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 DPI Gazdaságos"
+
+#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+msgid "180 DPI Economy"
+msgstr "180 DPI Gazdaságos"
+
+#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+msgid "360 x 180 DPI Draft"
+msgstr "360 x 180 DPI Piszkozat"
+
+#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 DPI Piszkozat"
+
+#: src/main/escp2-resolutions.c:68
+msgid "360 DPI High Quality"
+msgstr "360 dpi Jó minőségű"
+
+#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
+#: src/main/escp2-resolutions.c:77
+msgid "360 DPI"
+msgstr "360 DPI"
+
+#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+msgid "720 x 360 DPI"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+msgid "720 DPI"
+msgstr "720 DPI"
+
+#: src/main/escp2-resolutions.c:94
+msgid "720 DPI High Quality"
+msgstr "720 DPI Jó minőségű"
+
+#: src/main/escp2-resolutions.c:97
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "720x720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
+msgid "1440 x 720 DPI"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:110
+msgid "1440 x 720 DPI Highest Quality"
+msgstr "1440 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+msgid "2880 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:129
+msgid "2880 x 720 DPI Highest Quality"
+msgstr "2880 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
+msgid "1440 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
+msgid "2880 x 1440 DPI"
+msgstr "2880 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:158
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "2880 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "2880 x 720 DPI Legjobb minőségű"
+
+#: src/main/escp2-resolutions.c:171
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 2880 DPI"
+
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#, fuzzy
+msgid "5760 x 2880 DPI"
+msgstr "2880 x 2880 DPI"
+
+#: src/main/escp2-resolutions.c:548
+msgid "On"
+msgstr "Be"
+
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
+msgid "Interleave"
+msgstr "Kihagyás"
+
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
+msgid "Full Overlap"
+msgstr "Teljes átfedés"
+
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
+msgid "Four Pass"
+msgstr "Négymenetes"
+
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
+msgid "Full Overlap 2"
+msgstr "Teljes átfedés 2"
+
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+msgid "Interleave 2"
+msgstr "Kihagyás 2"
+
+#: src/main/escp2-resolutions.c:584
+msgid "Eight Pass"
+msgstr "Nyolclépéses"
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Szöveg"
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Grafika"
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Szöveg és grafika vegyesen"
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Fénykép"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Vonalrajz"
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Oldal"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Feladat"
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Képtípus"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "A nyomtatott kép típusa"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Feladat módja"
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Feladat vagy oldal mód"
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Oldalszám"
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Oldalszám"
+
+#: src/main/xmli18n-tmp.h:1
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/xmli18n-tmp.h:2
+msgid "Legal"
+msgstr "Legal"
+
+#: src/main/xmli18n-tmp.h:3
+msgid "Tabloid"
+msgstr "Tabloid"
+
+#: src/main/xmli18n-tmp.h:4
+msgid "Executive"
+msgstr "Executive"
+
+#: src/main/xmli18n-tmp.h:8
+msgid "3x5"
+msgstr "3x5"
+
+#: src/main/xmli18n-tmp.h:9
+msgid "4x6"
+msgstr "4x6"
+
+#: src/main/xmli18n-tmp.h:10
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr "Epson 4x6-os fotópapír"
+
+#: src/main/xmli18n-tmp.h:11
+msgid "5x7"
+msgstr "5x7"
+
+#: src/main/xmli18n-tmp.h:12
+msgid "5x8"
+msgstr "5x8"
+
+#: src/main/xmli18n-tmp.h:13
+msgid "6x8"
+msgstr "6x8"
+
+#: src/main/xmli18n-tmp.h:14
+msgid "8x10"
+msgstr "8x10"
+
+#: src/main/xmli18n-tmp.h:16
+msgid "12x18"
+msgstr "12x18"
+
+#: src/main/xmli18n-tmp.h:17
+msgid "Super B 13x19"
+msgstr "Super B 13x19"
+
+#: src/main/xmli18n-tmp.h:18
+msgid "Engineering C 17x22"
+msgstr "Mérnöki C 17x22"
+
+#: src/main/xmli18n-tmp.h:19
+msgid "8x12"
+msgstr "8x12"
+
+#: src/main/xmli18n-tmp.h:20
+msgid "11x14"
+msgstr "11x14"
+
+#: src/main/xmli18n-tmp.h:21
+msgid "16x20"
+msgstr "16x20"
+
+#: src/main/xmli18n-tmp.h:22
+msgid "16x24"
+msgstr "16x24"
+
+#: src/main/xmli18n-tmp.h:23
+msgid "20x24"
+msgstr "20x24"
+
+#: src/main/xmli18n-tmp.h:24
+msgid "20x30"
+msgstr "20x30"
+
+#: src/main/xmli18n-tmp.h:25
+msgid "22x30"
+msgstr "22x30"
+
+#: src/main/xmli18n-tmp.h:26
+msgid "24x30"
+msgstr "24x30"
+
+#: src/main/xmli18n-tmp.h:27
+msgid "Super A1 24x36"
+msgstr "Super A1 24x36"
+
+#: src/main/xmli18n-tmp.h:28
+msgid "30x40"
+msgstr "30x40"
+
+#: src/main/xmli18n-tmp.h:29
+msgid "4A"
+msgstr "4A"
+
+#: src/main/xmli18n-tmp.h:30
+msgid "2A"
+msgstr "2A"
+
+#: src/main/xmli18n-tmp.h:31
+msgid "Super A0"
+msgstr "Super A0"
+
+#: src/main/xmli18n-tmp.h:32
+msgid "A0"
+msgstr "A0"
+
+#: src/main/xmli18n-tmp.h:33
+msgid "A1"
+msgstr "A1"
+
+#: src/main/xmli18n-tmp.h:34
+msgid "A2"
+msgstr "A2"
+
+#: src/main/xmli18n-tmp.h:35
+msgid "A3"
+msgstr "A3"
+
+#: src/main/xmli18n-tmp.h:36
+msgid "A4"
+msgstr "A4"
+
+#: src/main/xmli18n-tmp.h:37
+msgid "A5"
+msgstr "A5"
+
+#: src/main/xmli18n-tmp.h:38
+msgid "A6"
+msgstr "A6"
+
+#: src/main/xmli18n-tmp.h:39
+msgid "A7"
+msgstr "A7"
+
+#: src/main/xmli18n-tmp.h:40
+msgid "A8"
+msgstr "A8"
+
+#: src/main/xmli18n-tmp.h:41
+msgid "A9"
+msgstr "A9"
+
+#: src/main/xmli18n-tmp.h:42
+msgid "A10"
+msgstr "A10"
+
+#: src/main/xmli18n-tmp.h:43
+msgid "RA0"
+msgstr "RA0"
+
+#: src/main/xmli18n-tmp.h:44
+msgid "RA1"
+msgstr "RA1"
+
+#: src/main/xmli18n-tmp.h:45
+msgid "RA2"
+msgstr "RA2"
+
+#: src/main/xmli18n-tmp.h:46
+msgid "RA3"
+msgstr "RA3"
+
+#: src/main/xmli18n-tmp.h:47
+msgid "RA4"
+msgstr "RA4"
+
+#: src/main/xmli18n-tmp.h:48
+msgid "SRA0"
+msgstr "SRA0"
+
+#: src/main/xmli18n-tmp.h:49
+msgid "SRA1"
+msgstr "SRA1"
+
+#: src/main/xmli18n-tmp.h:50
+msgid "SRA2"
+msgstr "SRA2"
+
+#: src/main/xmli18n-tmp.h:51
+msgid "SRA3"
+msgstr "SRA3"
+
+#: src/main/xmli18n-tmp.h:52
+msgid "SRA4"
+msgstr "SRA4"
+
+#: src/main/xmli18n-tmp.h:53
+msgid "4B ISO"
+msgstr "4B ISO"
+
+#: src/main/xmli18n-tmp.h:54
+msgid "2B ISO"
+msgstr "2B ISO"
+
+#: src/main/xmli18n-tmp.h:55
+msgid "B0 ISO"
+msgstr "B0 ISO"
+
+#: src/main/xmli18n-tmp.h:56
+msgid "B1 ISO"
+msgstr "B1 ISO"
+
+#: src/main/xmli18n-tmp.h:57
+msgid "B2 ISO"
+msgstr "B2 ISO"
+
+#: src/main/xmli18n-tmp.h:58
+msgid "B3 ISO"
+msgstr "B3 ISO"
+
+#: src/main/xmli18n-tmp.h:59
+msgid "B4 ISO"
+msgstr "B4 ISO"
+
+#: src/main/xmli18n-tmp.h:60
+msgid "B5 ISO"
+msgstr "B5 ISO"
+
+#: src/main/xmli18n-tmp.h:61
+msgid "B6 ISO"
+msgstr "B6 ISO"
+
+#: src/main/xmli18n-tmp.h:62
+msgid "B7 ISO"
+msgstr "B7 ISO"
+
+#: src/main/xmli18n-tmp.h:63
+msgid "B8 ISO"
+msgstr "B8 ISO"
+
+#: src/main/xmli18n-tmp.h:64
+msgid "B9 ISO"
+msgstr "B9 ISO"
+
+#: src/main/xmli18n-tmp.h:65
+msgid "B10 ISO"
+msgstr "B10 ISO"
+
+#: src/main/xmli18n-tmp.h:66
+msgid "Super B0 JIS"
+msgstr "Super B0 JIS"
+
+#: src/main/xmli18n-tmp.h:67
+msgid "B0 JIS"
+msgstr "B0 JIS"
+
+#: src/main/xmli18n-tmp.h:68
+msgid "B1 JIS"
+msgstr "B1 JIS"
+
+#: src/main/xmli18n-tmp.h:69
+msgid "B2 JIS"
+msgstr "B2 JIS"
+
+#: src/main/xmli18n-tmp.h:70
+msgid "B3 JIS"
+msgstr "B3 JIS"
+
+#: src/main/xmli18n-tmp.h:71
+msgid "B4 JIS"
+msgstr "B4 JIS"
+
+#: src/main/xmli18n-tmp.h:72
+msgid "B5 JIS"
+msgstr "B5 JIS"
+
+#: src/main/xmli18n-tmp.h:73
+msgid "B6 JIS"
+msgstr "B6 JIS"
+
+#: src/main/xmli18n-tmp.h:74
+msgid "B7 JIS"
+msgstr "B7 JIS"
+
+#: src/main/xmli18n-tmp.h:75
+msgid "B8 JIS"
+msgstr "B8 JIS"
+
+#: src/main/xmli18n-tmp.h:76
+msgid "B9 JIS"
+msgstr "B9 JIS"
+
+#: src/main/xmli18n-tmp.h:77
+msgid "B10 JIS"
+msgstr "B10 JIS"
+
+#: src/main/xmli18n-tmp.h:78
+msgid "C0"
+msgstr "C0"
+
+#: src/main/xmli18n-tmp.h:79
+msgid "C1"
+msgstr "C1"
+
+#: src/main/xmli18n-tmp.h:80
+msgid "C2"
+msgstr "C2"
+
+#: src/main/xmli18n-tmp.h:81
+msgid "C3"
+msgstr "C3"
+
+#: src/main/xmli18n-tmp.h:82
+msgid "C4"
+msgstr "C4"
+
+#: src/main/xmli18n-tmp.h:83
+msgid "C5"
+msgstr "C5"
+
+#: src/main/xmli18n-tmp.h:84
+msgid "B6-C4"
+msgstr "B6-C4"
+
+#: src/main/xmli18n-tmp.h:85
+msgid "C6"
+msgstr "C6"
+
+#: src/main/xmli18n-tmp.h:86
+msgid "DL"
+msgstr "DL"
+
+#: src/main/xmli18n-tmp.h:87
+msgid "C7-6"
+msgstr "C7-6"
+
+#: src/main/xmli18n-tmp.h:88
+msgid "C7"
+msgstr "C7"
+
+#: src/main/xmli18n-tmp.h:89
+msgid "C8"
+msgstr "C8"
+
+#: src/main/xmli18n-tmp.h:90
+msgid "C9"
+msgstr "C9"
+
+#: src/main/xmli18n-tmp.h:91
+msgid "C10"
+msgstr "C10"
+
+#: src/main/xmli18n-tmp.h:92
+msgid "ArchA"
+msgstr "ArchA"
+
+#: src/main/xmli18n-tmp.h:93
+msgid "ArchA transposed"
+msgstr "ArchA felcserélt"
+
+#: src/main/xmli18n-tmp.h:94
+msgid "ArchB"
+msgstr "ArchB"
+
+#: src/main/xmli18n-tmp.h:95
+msgid "ArchB transposed"
+msgstr "ArchB felcserélt"
+
+#: src/main/xmli18n-tmp.h:96
+msgid "ArchC"
+msgstr "ArchC"
+
+#: src/main/xmli18n-tmp.h:97
+msgid "ArchC transposed"
+msgstr "ArchC felcserélt"
+
+#: src/main/xmli18n-tmp.h:98
+msgid "ArchD"
+msgstr "ArchD"
+
+#: src/main/xmli18n-tmp.h:99
+msgid "ArchD transposed"
+msgstr "ArchD felcserélt"
+
+#: src/main/xmli18n-tmp.h:100
+msgid "ArchE"
+msgstr "ArchE"
+
+#: src/main/xmli18n-tmp.h:101
+msgid "ArchE transposed"
+msgstr "ArchE felcserélt"
+
+#: src/main/xmli18n-tmp.h:102
+msgid "American foolscap"
+msgstr "Amerikai írólap"
+
+#: src/main/xmli18n-tmp.h:103
+msgid "European foolscap"
+msgstr "Európai írólap"
+
+#: src/main/xmli18n-tmp.h:104
+msgid "Crown Quarto"
+msgstr "Crown Quarto"
+
+#: src/main/xmli18n-tmp.h:105
+msgid "Large Crown Quarto"
+msgstr "Nagy Crown Quarto"
+
+#: src/main/xmli18n-tmp.h:106
+msgid "Demy Quarto"
+msgstr "Demy Quarto"
+
+#: src/main/xmli18n-tmp.h:107
+msgid "Royal Quarto"
+msgstr "Royal Quarto"
+
+#: src/main/xmli18n-tmp.h:108
+msgid "ISO A4"
+msgstr "ISO A4"
+
+#: src/main/xmli18n-tmp.h:109
+msgid "Crown Octavo"
+msgstr "Crown Octavo"
+
+#: src/main/xmli18n-tmp.h:110
+msgid "Large Crown Octavo"
+msgstr "Nagy Crown Octavo"
+
+#: src/main/xmli18n-tmp.h:111
+msgid "Demy Octavo"
+msgstr "Demy Octavo"
+
+#: src/main/xmli18n-tmp.h:112
+msgid "Royal Octavo"
+msgstr "Royal Octavo"
+
+#: src/main/xmli18n-tmp.h:113
+msgid "ISO A5"
+msgstr "ISO A5"
+
+#: src/main/xmli18n-tmp.h:114
+msgid "Small paperback"
+msgstr "Kis paperback"
+
+#: src/main/xmli18n-tmp.h:115
+msgid "Penguin small paperback"
+msgstr "Penguin, kis paperback"
+
+#: src/main/xmli18n-tmp.h:116
+msgid "Penguin large paperback"
+msgstr "Penguin, nagy paperback"
+
+#: src/main/xmli18n-tmp.h:117
+msgid "10cm x 15cm"
+msgstr "10cm x 15cm"
+
+#: src/main/xmli18n-tmp.h:118
+msgid "Hagaki Card"
+msgstr "Hagaki kártya"
+
+#: src/main/xmli18n-tmp.h:119
+msgid "Oufuku Card"
+msgstr "Oufuku kártya"
+
+#: src/main/xmli18n-tmp.h:120
+msgid "Japanese long envelope #3"
+msgstr "Japán hosszú boríték #3"
+
+#: src/main/xmli18n-tmp.h:121
+msgid "Japanese long envelope #4"
+msgstr "Japán hosszú boríték #4"
+
+#: src/main/xmli18n-tmp.h:122
+msgid "Japanese Kaku envelope #4"
+msgstr "Japán Kaku boríték #4"
+
+#: src/main/xmli18n-tmp.h:123
+msgid "Commercial 10"
+msgstr "Commercial 10"
+
+#: src/main/xmli18n-tmp.h:124
+msgid "A2 Invitation"
+msgstr "A2 meghívó"
+
+#: src/main/xmli18n-tmp.h:125
+msgid "Monarch Envelope"
+msgstr "Monarch boríték"
+
+#: src/main/xmli18n-tmp.h:126
+msgid "4x5 3/8"
+msgstr "4x5 3/8"
+
+#: src/main/xmli18n-tmp.h:127
+msgid "4x7"
+msgstr "4x7"
+
+#: src/main/xmli18n-tmp.h:128
+msgid "CP_L"
+msgstr "CP_L"
+
+#: src/main/xmli18n-tmp.h:129
+msgid "Card"
+msgstr "Kártya"
+
+#: src/main/xmli18n-tmp.h:130
+msgid "Wide Postcard"
+msgstr "Széles levelezőlap"
+
+#: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
+msgid "Custom"
+msgstr "Egyéni"
+
+#: src/main/xmli18n-tmp.h:135
+msgid "89 mm Roll Paper"
+msgstr "89mm-es papírtekercs"
+
+#: src/main/xmli18n-tmp.h:136
+msgid "4 Inch Roll Paper"
+msgstr "4 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:137
+msgid "5 Inch Roll Paper"
+msgstr "5 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:138
+msgid "210 mm Roll Paper"
+msgstr "210 mm-es papírtekercs"
+
+#: src/main/xmli18n-tmp.h:139
+msgid "13 Inch Roll Paper"
+msgstr "13 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:140
+msgid "22 Inch Roll Paper"
+msgstr "22 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:141
+msgid "24 Inch Roll Paper"
+msgstr "24 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:142
+msgid "36 Inch Roll Paper"
+msgstr "36 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:143
+msgid "44 Inch Roll Paper"
+msgstr "44 hüvelykes papírtekercs"
+
+#: src/main/xmli18n-tmp.h:144
+msgid "PostScript Level 1"
+msgstr "1. szintű PostScript"
+
+#: src/main/xmli18n-tmp.h:145
+msgid "PostScript Level 2"
+msgstr "2. szintű PostScript"
+
+#: src/main/xmli18n-tmp.h:146
+#, fuzzy
+msgid "Canon BJ-30"
+msgstr "Canon BJC 30"
+
+#: src/main/xmli18n-tmp.h:147
+#, fuzzy
+msgid "Canon BJC-50"
+msgstr "Canon BJC 50"
+
+#: src/main/xmli18n-tmp.h:148
+#, fuzzy
+msgid "Canon BJC-55"
+msgstr "Canon BJC 55"
+
+#: src/main/xmli18n-tmp.h:149
+#, fuzzy
+msgid "Canon BJC-80"
+msgstr "Canon BJC 80"
+
+#: src/main/xmli18n-tmp.h:150
+#, fuzzy
+msgid "Canon BJC-85"
+msgstr "Canon BJC 85"
+
+#: src/main/xmli18n-tmp.h:151
+#, fuzzy
+msgid "Canon BJC-210"
+msgstr "Canon BJC 210"
+
+#: src/main/xmli18n-tmp.h:152
+#, fuzzy
+msgid "Canon BJC-240"
+msgstr "Canon BJC 240"
+
+#: src/main/xmli18n-tmp.h:153
+#, fuzzy
+msgid "Canon BJC-250"
+msgstr "Canon BJC 250"
+
+#: src/main/xmli18n-tmp.h:154
+#, fuzzy
+msgid "Canon BJC-1000"
+msgstr "Canon BJC 1000"
+
+#: src/main/xmli18n-tmp.h:155
+#, fuzzy
+msgid "Canon BJC-2000"
+msgstr "Canon BJC 2000"
+
+#: src/main/xmli18n-tmp.h:156
+#, fuzzy
+msgid "Canon BJC-2010"
+msgstr "Canon BJC 210"
+
+#: src/main/xmli18n-tmp.h:157
+#, fuzzy
+msgid "Canon BJC-2100"
+msgstr "Canon BJC 210"
+
+#: src/main/xmli18n-tmp.h:158
+#, fuzzy
+msgid "Canon BJC-2110"
+msgstr "Canon BJC 210"
+
+#: src/main/xmli18n-tmp.h:159
+#, fuzzy
+msgid "Canon BJC-3000"
+msgstr "Canon BJC 3000"
+
+#: src/main/xmli18n-tmp.h:160
+#, fuzzy
+msgid "Canon BJC-4000"
+msgstr "Canon BJC 7000"
+
+#: src/main/xmli18n-tmp.h:161
+#, fuzzy
+msgid "Canon BJC-4300"
+msgstr "Canon BJC 4300"
+
+#: src/main/xmli18n-tmp.h:162
+#, fuzzy
+msgid "Canon BJC-4400"
+msgstr "Canon BJC 4300"
+
+#: src/main/xmli18n-tmp.h:163
+#, fuzzy
+msgid "Canon BJC-6000"
+msgstr "Canon BJC 6000"
+
+#: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-6100"
+msgstr "Canon BJC 6100"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-6200"
+msgstr "Canon BJC 6200"
+
+#: src/main/xmli18n-tmp.h:166
+#, fuzzy
+msgid "Canon BJC-6500"
+msgstr "Canon BJC 6500"
+
+#: src/main/xmli18n-tmp.h:167
+#, fuzzy
+msgid "Canon BJC-7000"
+msgstr "Canon BJC 7000"
+
+#: src/main/xmli18n-tmp.h:168
+#, fuzzy
+msgid "Canon BJC-7100"
+msgstr "Canon BJC 7100"
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "Canon BJC-8200"
+msgstr "Canon BJC 8200"
+
+#: src/main/xmli18n-tmp.h:170
+#, fuzzy
+msgid "Canon S100"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:171
+#, fuzzy
+msgid "Canon S200"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "Canon S300"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:173
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:174
+msgid "Canon S450"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "Canon S500"
+msgstr "Canon S4500"
+
+#: src/main/xmli18n-tmp.h:176
+#, fuzzy
+msgid "Canon S600"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:177
+#, fuzzy
+msgid "Canon S630"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:178
+msgid "Canon S800"
+msgstr "Canon S800"
+
+#: src/main/xmli18n-tmp.h:179
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/main/xmli18n-tmp.h:180
+#, fuzzy
+msgid "Canon iP4000"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Epson Stylus C20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Epson Stylus C20SX"
+msgstr "EPSON Stylus C20SX"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Epson Stylus C20UX"
+msgstr "EPSON Stylus C20UX"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Epson Stylus C40"
+msgstr "EPSON Stylus C40SX"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Epson Stylus C40SX"
+msgstr "EPSON Stylus C40SX"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Epson Stylus C40UX"
+msgstr "EPSON Stylus C40UX"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Epson Stylus C41"
+msgstr "EPSON Stylus C41SX"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Epson Stylus C41SX"
+msgstr "EPSON Stylus C41SX"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Epson Stylus C41UX"
+msgstr "EPSON Stylus C41UX"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Epson Stylus C42"
+msgstr "EPSON Stylus C42SX"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Epson Stylus C42SX"
+msgstr "EPSON Stylus C42SX"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Epson Stylus C42UX"
+msgstr "EPSON Stylus C42UX"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Epson Stylus C43"
+msgstr "EPSON Stylus C43SX"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Epson Stylus C43SX"
+msgstr "EPSON Stylus C43SX"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Epson Stylus C43UX"
+msgstr "EPSON Stylus C43UX"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Epson Stylus C44"
+msgstr "EPSON Stylus C44SX"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Epson Stylus C44SX"
+msgstr "EPSON Stylus C44SX"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Epson Stylus C44UX"
+msgstr "EPSON Stylus C44UX"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Epson Stylus C45"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Epson Stylus C46"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Epson Stylus C48"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Epson Stylus C50"
+msgstr "EPSON Stylus C50"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Epson Stylus C60"
+msgstr "EPSON Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Epson Stylus C61"
+msgstr "EPSON Stylus C61"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Epson Stylus C62"
+msgstr "EPSON Stylus C62"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Epson Stylus C63"
+msgstr "EPSON Stylus C63"
+
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Epson Stylus C64"
+msgstr "EPSON Stylus C64"
+
+#: src/main/xmli18n-tmp.h:208
+#, fuzzy
+msgid "Epson Stylus C65"
+msgstr "EPSON Stylus C65"
+
+#: src/main/xmli18n-tmp.h:209
+#, fuzzy
+msgid "Epson Stylus C66"
+msgstr "EPSON Stylus C66"
+
+#: src/main/xmli18n-tmp.h:210
+#, fuzzy
+msgid "Epson Stylus C68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:211
+#, fuzzy
+msgid "Epson Stylus C70"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:212
+#, fuzzy
+msgid "Epson Stylus C80"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:213
+#, fuzzy
+msgid "Epson Stylus C82"
+msgstr "EPSON Stylus C82"
+
+#: src/main/xmli18n-tmp.h:214
+#, fuzzy
+msgid "Epson Stylus C83"
+msgstr "EPSON Stylus C83"
+
+#: src/main/xmli18n-tmp.h:215
+#, fuzzy
+msgid "Epson Stylus C84"
+msgstr "EPSON Stylus C84"
+
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Epson Stylus C85"
+msgstr "EPSON Stylus C85"
+
+#: src/main/xmli18n-tmp.h:217
+#, fuzzy
+msgid "Epson Stylus C86"
+msgstr "EPSON Stylus C86"
+
+#: src/main/xmli18n-tmp.h:218
+#, fuzzy
+msgid "Epson Stylus C88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:219
+#, fuzzy
+msgid "Epson Stylus Color"
+msgstr "EPSON Stylus Color"
+
+#: src/main/xmli18n-tmp.h:220
+#, fuzzy
+msgid "Epson Stylus Color I"
+msgstr "EPSON Stylus Color"
+
+#: src/main/xmli18n-tmp.h:221
+#, fuzzy
+msgid "Epson Stylus Color II"
+msgstr "EPSON Stylus Color"
+
+#: src/main/xmli18n-tmp.h:222
+#, fuzzy
+msgid "Epson Stylus Color IIs"
+msgstr "EPSON Stylus Color"
+
+#: src/main/xmli18n-tmp.h:223
+#, fuzzy
+msgid "Epson Stylus Color PRO"
+msgstr "EPSON Stylus Color Pro"
+
+#: src/main/xmli18n-tmp.h:224
+#, fuzzy
+msgid "Epson Stylus Pro XL"
+msgstr "EPSON Stylus Color Pro XL"
+
+#: src/main/xmli18n-tmp.h:225
+#, fuzzy
+msgid "Epson Stylus Color 400"
+msgstr "EPSON Stylus Color 400"
+
+#: src/main/xmli18n-tmp.h:226
+#, fuzzy
+msgid "Epson Stylus Color 440"
+msgstr "EPSON Stylus Color 440"
+
+#: src/main/xmli18n-tmp.h:227
+#, fuzzy
+msgid "Epson Stylus Color 460"
+msgstr "EPSON Stylus Color 460"
+
+#: src/main/xmli18n-tmp.h:228
+#, fuzzy
+msgid "Epson Stylus Color 480"
+msgstr "EPSON Stylus Color 480"
+
+#: src/main/xmli18n-tmp.h:229
+#, fuzzy
+msgid "Epson Stylus Color 500"
+msgstr "EPSON Stylus Color 500"
+
+#: src/main/xmli18n-tmp.h:230
+#, fuzzy
+msgid "Epson Stylus Color 580"
+msgstr "EPSON Stylus Color 580"
+
+#: src/main/xmli18n-tmp.h:231
+#, fuzzy
+msgid "Epson Stylus Color 600"
+msgstr "EPSON Stylus Color 600"
+
+#: src/main/xmli18n-tmp.h:232
+#, fuzzy
+msgid "Epson Stylus Color 640"
+msgstr "EPSON Stylus Color 640"
+
+#: src/main/xmli18n-tmp.h:233
+#, fuzzy
+msgid "Epson Stylus Color 660"
+msgstr "EPSON Stylus Color 660"
+
+#: src/main/xmli18n-tmp.h:234
+#, fuzzy
+msgid "Epson Stylus Color 670"
+msgstr "EPSON Stylus Color 670"
+
+#: src/main/xmli18n-tmp.h:235
+#, fuzzy
+msgid "Epson Stylus Color 680"
+msgstr "EPSON Stylus Color 680"
+
+#: src/main/xmli18n-tmp.h:236
+#, fuzzy
+msgid "Epson Stylus Color 740"
+msgstr "EPSON Stylus Color 740"
+
+#: src/main/xmli18n-tmp.h:237
+#, fuzzy
+msgid "Epson Stylus Color 760"
+msgstr "EPSON Stylus Color 760"
+
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus Color 777"
+msgstr "EPSON Stylus Color 777"
+
+#: src/main/xmli18n-tmp.h:239
+#, fuzzy
+msgid "Epson Stylus Color 800"
+msgstr "EPSON Stylus Color 800"
+
+#: src/main/xmli18n-tmp.h:240
+#, fuzzy
+msgid "Epson Stylus Color 850"
+msgstr "EPSON Stylus Color 850"
+
+#: src/main/xmli18n-tmp.h:241
+#, fuzzy
+msgid "Epson Stylus Color 860"
+msgstr "EPSON Stylus Color 860"
+
+#: src/main/xmli18n-tmp.h:242
+#, fuzzy
+msgid "Epson Stylus Color 880"
+msgstr "EPSON Stylus Color 880"
+
+#: src/main/xmli18n-tmp.h:243
+#, fuzzy
+msgid "Epson Stylus Color 8 3"
+msgstr "EPSON Stylus Color 83"
+
+#: src/main/xmli18n-tmp.h:244
+#, fuzzy
+msgid "Epson Stylus Color 900"
+msgstr "EPSON Stylus Color 900"
+
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus Color 980"
+msgstr "EPSON Stylus Color 980"
+
+#: src/main/xmli18n-tmp.h:246
+#, fuzzy
+msgid "Epson Stylus Color 1160"
+msgstr "EPSON Stylus Color 1160"
+
+#: src/main/xmli18n-tmp.h:247
+#, fuzzy
+msgid "Epson Stylus Color 1500"
+msgstr "EPSON Stylus Color 1500"
+
+#: src/main/xmli18n-tmp.h:248
+#, fuzzy
+msgid "Epson Stylus Color 1520"
+msgstr "EPSON Stylus Color 1520"
+
+#: src/main/xmli18n-tmp.h:249
+#, fuzzy
+msgid "Epson Stylus Color 3000"
+msgstr "EPSON Stylus Color 3000"
+
+#: src/main/xmli18n-tmp.h:250
+#, fuzzy
+msgid "Epson Stylus Photo"
+msgstr "EPSON Stylus Photo"
+
+#: src/main/xmli18n-tmp.h:251
+#, fuzzy
+msgid "Epson Stylus Photo 700"
+msgstr "EPSON Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:252
+#, fuzzy
+msgid "Epson Stylus Photo EX"
+msgstr "EPSON Stylus Photo EX"
+
+#: src/main/xmli18n-tmp.h:253
+#, fuzzy
+msgid "Epson Stylus Photo EX3"
+msgstr "EPSON Stylus Photo EX3"
+
+#: src/main/xmli18n-tmp.h:254
+#, fuzzy
+msgid "Epson Stylus Photo 720"
+msgstr "EPSON Stylus Photo 720"
+
+#: src/main/xmli18n-tmp.h:255
+#, fuzzy
+msgid "Epson Stylus Photo 750"
+msgstr "EPSON Stylus Photo 750"
+
+#: src/main/xmli18n-tmp.h:256
+#, fuzzy
+msgid "Epson Stylus Photo 780"
+msgstr "EPSON Stylus Photo 780"
+
+#: src/main/xmli18n-tmp.h:257
+#, fuzzy
+msgid "Epson Stylus Photo 785"
+msgstr "EPSON Stylus Photo 895"
+
+#: src/main/xmli18n-tmp.h:258
+#, fuzzy
+msgid "Epson Stylus Photo 790"
+msgstr "EPSON Stylus Photo 790"
+
+#: src/main/xmli18n-tmp.h:259
+#, fuzzy
+msgid "Epson Stylus Photo 810"
+msgstr "EPSON Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:260
+#, fuzzy
+msgid "Epson Stylus Photo 820"
+msgstr "EPSON Stylus Photo 820"
+
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus Photo 825"
+msgstr "EPSON Stylus Photo 825"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus Photo 830"
+msgstr "EPSON Stylus Photo 830"
+
+#: src/main/xmli18n-tmp.h:263
+#, fuzzy
+msgid "Epson Stylus Photo 830U"
+msgstr "EPSON Stylus Photo 830"
+
+#: src/main/xmli18n-tmp.h:264
+#, fuzzy
+msgid "Epson Stylus Photo 870"
+msgstr "EPSON Stylus Photo 870"
+
+#: src/main/xmli18n-tmp.h:265
+#, fuzzy
+msgid "Epson Stylus Photo 875"
+msgstr "EPSON Stylus Photo 875"
+
+#: src/main/xmli18n-tmp.h:266
+#, fuzzy
+msgid "Epson Stylus Photo 890"
+msgstr "EPSON Stylus Photo 890"
+
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "Epson Stylus Photo 895"
+msgstr "EPSON Stylus Photo 895"
+
+#: src/main/xmli18n-tmp.h:268
+#, fuzzy
+msgid "Epson Stylus Photo 900"
+msgstr "EPSON Stylus Photo 900"
+
+#: src/main/xmli18n-tmp.h:269
+#, fuzzy
+msgid "Epson Stylus Photo 915"
+msgstr "EPSON Stylus Photo 915"
+
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "Epson Stylus Photo 925"
+msgstr "EPSON Stylus Photo 925"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "Epson Stylus Photo 935"
+msgstr "EPSON Stylus Photo 935"
+
+#: src/main/xmli18n-tmp.h:272
+#, fuzzy
+msgid "Epson Stylus Photo 950"
+msgstr "EPSON Stylus Photo 950"
+
+#: src/main/xmli18n-tmp.h:273
+#, fuzzy
+msgid "Epson Stylus Photo 960"
+msgstr "EPSON Stylus Photo 960"
+
+#: src/main/xmli18n-tmp.h:274
+#, fuzzy
+msgid "Epson Stylus Photo 1200"
+msgstr "EPSON Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:275
+#, fuzzy
+msgid "Epson Stylus Photo 1270"
+msgstr "EPSON Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:276
+#, fuzzy
+msgid "Epson Stylus Photo 1280"
+msgstr "EPSON Stylus Photo 1280"
+
+#: src/main/xmli18n-tmp.h:277
+#, fuzzy
+msgid "Epson Stylus Photo 1290"
+msgstr "EPSON Stylus Photo 1290"
+
+#: src/main/xmli18n-tmp.h:278
+#, fuzzy
+msgid "Epson Stylus Photo 2000P"
+msgstr "EPSON Stylus Photo 2000P"
+
+#: src/main/xmli18n-tmp.h:279
+#, fuzzy
+msgid "Epson Stylus Photo 2100"
+msgstr "EPSON Stylus Photo 2100"
+
+#: src/main/xmli18n-tmp.h:280
+#, fuzzy
+msgid "Epson Stylus Photo 2200"
+msgstr "EPSON Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "Epson Stylus Photo R200"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:282
+#, fuzzy
+msgid "Epson Stylus Photo R210"
+msgstr "EPSON Stylus Photo R210"
+
+#: src/main/xmli18n-tmp.h:283
+#, fuzzy
+msgid "Epson Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "Epson Stylus Photo R300"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:285
+#, fuzzy
+msgid "Epson Stylus Photo R310"
+msgstr "EPSON Stylus Photo R310"
+
+#: src/main/xmli18n-tmp.h:286
+#, fuzzy
+msgid "Epson Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:287
+#, fuzzy
+msgid "Epson Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:288
+#, fuzzy
+msgid "Epson Stylus Photo RX400"
+msgstr "EPSON Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:289
+#, fuzzy
+msgid "Epson Stylus Photo RX420"
+msgstr "EPSON Stylus Photo RX420"
+
+#: src/main/xmli18n-tmp.h:290
+#, fuzzy
+msgid "Epson Stylus Photo RX425"
+msgstr "EPSON Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:291
+#, fuzzy
+msgid "Epson Stylus Photo RX430"
+msgstr "EPSON Stylus Photo RX430"
+
+#: src/main/xmli18n-tmp.h:292
+#, fuzzy
+msgid "Epson Stylus Photo RX500"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:293
+#, fuzzy
+msgid "Epson Stylus Photo RX510"
+msgstr "EPSON Stylus Photo RX510"
+
+#: src/main/xmli18n-tmp.h:294
+#, fuzzy
+msgid "Epson Stylus Photo RX600"
+msgstr "EPSON Stylus Photo RX600"
+
+#: src/main/xmli18n-tmp.h:295
+#, fuzzy
+msgid "Epson Stylus Photo RX620"
+msgstr "EPSON Stylus Photo RX620"
+
+#: src/main/xmli18n-tmp.h:296
+#, fuzzy
+msgid "Epson Stylus Photo RX630"
+msgstr "EPSON Stylus Photo RX630"
+
+#: src/main/xmli18n-tmp.h:297
+#, fuzzy
+msgid "Epson Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX600"
+
+#: src/main/xmli18n-tmp.h:298
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "EPSON Stylus Photo R800"
+
+#: src/main/xmli18n-tmp.h:299
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "EPSON Stylus Photo R1800"
+
+#: src/main/xmli18n-tmp.h:300
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:301
+#, fuzzy
+msgid "Epson Stylus Pro 5000"
+msgstr "EPSON Stylus Pro 5000"
+
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Epson Stylus Pro 5500"
+msgstr "EPSON Stylus Pro 5500"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "Epson Stylus Pro 7000"
+msgstr "EPSON Stylus Pro 7000"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "Epson Stylus Pro 7500"
+msgstr "EPSON Stylus Pro 7500"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "Epson Stylus Pro 7600"
+msgstr "EPSON Stylus Pro 7600"
+
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Pro 9000"
+msgstr "EPSON Stylus Pro 9000"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Pro 9500"
+msgstr "EPSON Stylus Pro 9500"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "Epson Stylus Pro 9600"
+msgstr "EPSON Stylus Pro 9600"
+
+#: src/main/xmli18n-tmp.h:309
+#, fuzzy
+msgid "Epson Stylus Pro 10000"
+msgstr "EPSON Stylus Pro 10000"
+
+#: src/main/xmli18n-tmp.h:310
+#, fuzzy
+msgid "Epson Stylus Scan 2000"
+msgstr "EPSON Stylus Scan 2000"
+
+#: src/main/xmli18n-tmp.h:311
+#, fuzzy
+msgid "Epson Stylus Scan 2500"
+msgstr "EPSON Stylus Scan 2500"
+
+#: src/main/xmli18n-tmp.h:312
+#, fuzzy
+msgid "Epson Stylus CX1500"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "Epson Stylus CX3100"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus CX3200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus CX3500"
+msgstr "EPSON Stylus CX3500"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus CX3600"
+msgstr "EPSON Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus CX3650"
+msgstr "EPSON Stylus CX3650"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus CX3700"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus CX3800"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:320
+#, fuzzy
+msgid "Epson Stylus CX3805"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:321
+#, fuzzy
+msgid "Epson Stylus CX3810"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "Epson Stylus CX4100"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "Epson Stylus CX4200"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus CX4500"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus CX4600"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus CX4700"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus CX4800"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Epson Stylus CX5100"
+msgstr "EPSON Stylus CX5100"
+
+#: src/main/xmli18n-tmp.h:329
+#, fuzzy
+msgid "Epson Stylus CX5200"
+msgstr "EPSON Stylus CX5200"
+
+#: src/main/xmli18n-tmp.h:330
+#, fuzzy
+msgid "Epson Stylus CX5300"
+msgstr "EPSON Stylus CX5300"
+
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "Epson Stylus CX5400"
+msgstr "EPSON Stylus CX5400"
+
+#: src/main/xmli18n-tmp.h:332
+#, fuzzy
+msgid "Epson Stylus CX5700"
+msgstr "EPSON Stylus CX6500"
+
+#: src/main/xmli18n-tmp.h:333
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "EPSON Stylus CX6300"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "EPSON Stylus CX6400"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "EPSON Stylus CX6500"
+
+#: src/main/xmli18n-tmp.h:337
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "EPSON Stylus CX6600"
+
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "Epson Stylus CX7700"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:339
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:341
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:342
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:343
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:344
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:345
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "EPSON Stylus CX3500"
+
+#: src/main/xmli18n-tmp.h:346
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:347
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:348
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:349
+msgid "Epson PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:350
+msgid "Epson PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:351
+#, fuzzy
+msgid "Epson CL 700"
+msgstr "Canon BJC 7000"
+
+#: src/main/xmli18n-tmp.h:352
+msgid "Epson CL 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:353
+msgid "Epson CL 760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:354
+msgid "Epson E 100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:355
+msgid "Epson E 150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:356
+msgid "Epson E 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:357
+#, fuzzy
+msgid "Epson EM 900C"
+msgstr "EPSON EM-900C"
+
+#: src/main/xmli18n-tmp.h:358
+#, fuzzy
+msgid "Epson EM 930C"
+msgstr "EPSON EM-930C"
+
+#: src/main/xmli18n-tmp.h:359
+#, fuzzy
+msgid "Epson MC 2000"
+msgstr "Canon BJC 2000"
+
+#: src/main/xmli18n-tmp.h:360
+#, fuzzy
+msgid "Epson MC 5000"
+msgstr "EPSON MC-5000"
+
+#: src/main/xmli18n-tmp.h:361
+#, fuzzy
+msgid "Epson MC 7000"
+msgstr "Canon BJC 7000"
+
+#: src/main/xmli18n-tmp.h:362
+#, fuzzy
+msgid "Epson MC 9000"
+msgstr "EPSON MC-9000"
+
+#: src/main/xmli18n-tmp.h:363
+#, fuzzy
+msgid "Epson MC 10000"
+msgstr "Canon BJC 1000"
+
+#: src/main/xmli18n-tmp.h:364
+#, fuzzy
+msgid "Epson MJ 930C"
+msgstr "EPSON MJ-930C"
+
+#: src/main/xmli18n-tmp.h:365
+#, fuzzy
+msgid "Epson MJ 5100C"
+msgstr "EPSON MJ-5100C"
+
+#: src/main/xmli18n-tmp.h:366
+#, fuzzy
+msgid "Epson MJ 6000C"
+msgstr "Canon BJC 6000"
+
+#: src/main/xmli18n-tmp.h:367
+#, fuzzy
+msgid "Epson MJ 8000C"
+msgstr "EPSON MJ-8000C"
+
+#: src/main/xmli18n-tmp.h:368
+#, fuzzy
+msgid "Epson PM 700C"
+msgstr "EPSON PM-700C"
+
+#: src/main/xmli18n-tmp.h:369
+#, fuzzy
+msgid "Epson PM 730C"
+msgstr "EPSON PM-730C"
+
+#: src/main/xmli18n-tmp.h:370
+#, fuzzy
+msgid "Epson PM 740C"
+msgstr "EPSON PM-740C"
+
+#: src/main/xmli18n-tmp.h:371
+#, fuzzy
+msgid "Epson PM 750C"
+msgstr "EPSON PM-750C"
+
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson PM 760C"
+msgstr "EPSON PM-760C"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson PM 770C"
+msgstr "EPSON PM-770C"
+
+#: src/main/xmli18n-tmp.h:374
+#, fuzzy
+msgid "Epson PM 780C"
+msgstr "EPSON PM-780C"
+
+#: src/main/xmli18n-tmp.h:375
+#, fuzzy
+msgid "Epson PM 790PT"
+msgstr "EPSON PM-790PT"
+
+#: src/main/xmli18n-tmp.h:376
+#, fuzzy
+msgid "Epson PM 800C"
+msgstr "EPSON PM-800C"
+
+#: src/main/xmli18n-tmp.h:377
+#, fuzzy
+msgid "Epson PM 850PT"
+msgstr "EPSON PM-850PT"
+
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "Epson PM 870C"
+msgstr "EPSON PM-870C"
+
+#: src/main/xmli18n-tmp.h:379
+#, fuzzy
+msgid "Epson PM 880C"
+msgstr "EPSON PM-880C"
+
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson PM 930C"
+msgstr "EPSON PM-930C"
+
+#: src/main/xmli18n-tmp.h:381
+#, fuzzy
+msgid "Epson PM 940C"
+msgstr "EPSON PM-940C"
+
+#: src/main/xmli18n-tmp.h:382
+#, fuzzy
+msgid "Epson PM 950C"
+msgstr "EPSON PM-950C"
+
+#: src/main/xmli18n-tmp.h:383
+#, fuzzy
+msgid "Epson PM 970C"
+msgstr "EPSON PM-970C"
+
+#: src/main/xmli18n-tmp.h:384
+#, fuzzy
+msgid "Epson PM 980C"
+msgstr "EPSON PM-980C"
+
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson PM 2000C"
+msgstr "EPSON PM-2000C"
+
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "Epson PM 2200C"
+msgstr "EPSON PM-2200C"
+
+#: src/main/xmli18n-tmp.h:387
+#, fuzzy
+msgid "Epson PM 3000C"
+msgstr "EPSON PM-3000C"
+
+#: src/main/xmli18n-tmp.h:388
+#, fuzzy
+msgid "Epson PM 3300C"
+msgstr "EPSON PM-3300C"
+
+#: src/main/xmli18n-tmp.h:389
+#, fuzzy
+msgid "Epson PM 3500C"
+msgstr "EPSON PM-3500C"
+
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson PM 3700C"
+msgstr "EPSON PM-3700C"
+
+#: src/main/xmli18n-tmp.h:391
+#, fuzzy
+msgid "Epson PM 4000PX"
+msgstr "EPSON PM-4000PX"
+
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "Epson PM 5000C"
+msgstr "EPSON PM-5000C"
+
+#: src/main/xmli18n-tmp.h:393
+#, fuzzy
+msgid "Epson PM 7000C"
+msgstr "EPSON PM-7000C"
+
+#: src/main/xmli18n-tmp.h:394
+#, fuzzy
+msgid "Epson PM 9000C"
+msgstr "EPSON PM-9000C"
+
+#: src/main/xmli18n-tmp.h:395
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "EPSON PM-10000"
+
+#: src/main/xmli18n-tmp.h:396
+msgid "Epson PM A650"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:397
+msgid "Epson PM A750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:398
+msgid "Epson PM A890"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PM A900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PM A950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PM D600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "EPSON PM-D750"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "EPSON PM-D770"
+
+#: src/main/xmli18n-tmp.h:404
+msgid "Epson PM D800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "EPSON PM-D1000"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "EPSON PM-G700"
+
+#: src/main/xmli18n-tmp.h:407
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "EPSON PM-G720"
+
+#: src/main/xmli18n-tmp.h:408
+msgid "Epson PM G730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:409
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "EPSON PM-G800"
+
+#: src/main/xmli18n-tmp.h:410
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "EPSON PM-G820"
+
+#: src/main/xmli18n-tmp.h:411
+msgid "Epson PX A650"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:412
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "EPSON PX-G900"
+
+#: src/main/xmli18n-tmp.h:413
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "EPSON PX-G920"
+
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "EPSON PX-G5000"
+
+#: src/main/xmli18n-tmp.h:415
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:416
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:417
+msgid "Epson PX V630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:418
+msgid "Epson PX 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:419
+#, fuzzy
+msgid "Epson PX 7000"
+msgstr "EPSON PX-7000"
+
+#: src/main/xmli18n-tmp.h:420
+#, fuzzy
+msgid "Epson PX 9000"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:421
+msgid "Apollo P-2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:422
+msgid "Apollo P-2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:423
+msgid "Apollo P-2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:424
+msgid "Apollo P-2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:425
+msgid "Apollo P-2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:426
+msgid "Apollo P-2550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:427
+msgid "Apollo P-2600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:428
+msgid "Apollo P-2650"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:429
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/main/xmli18n-tmp.h:430
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/main/xmli18n-tmp.h:431
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/main/xmli18n-tmp.h:432
+msgid "Apple LaserWriter Select 360"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:433
+msgid "Brother DCP-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:434
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:435
+msgid "Brother HL-10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:436
+msgid "Brother HL-10h"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:437
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Brother HL-1040"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Brother HL-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Brother HL-1060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Brother HL-1070"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Brother HL-1240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Brother HL-1250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Brother HL-1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Brother HL-1270N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Brother HL-1440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Brother HL-1660e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Brother HL-2060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Brother MFC-6550MC"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Brother MFC-8300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:454
+msgid "Brother MFC-9500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
+msgid "Brother MFC-9600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:456
+#, fuzzy
+msgid "Canon GP 335"
+msgstr "Canon BJC 85"
+
+#: src/main/xmli18n-tmp.h:457
+#, fuzzy
+msgid "Canon LBP-4sx"
+msgstr "Canon BJC 240"
+
+#: src/main/xmli18n-tmp.h:458
+#, fuzzy
+msgid "Canon LBP-430"
+msgstr "Canon BJC 4300"
+
+#: src/main/xmli18n-tmp.h:459
+#, fuzzy
+msgid "Canon LBP-1000"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:460
+#, fuzzy
+msgid "Canon LBP-1260"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:461
+#, fuzzy
+msgid "Canon LBP-1760"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Canon imageRunner 330s"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Citizen ProJet II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:464
+msgid "DEC 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:465
+msgid "DEC LN17"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+#, fuzzy
+msgid "HP Business Inkjet 2200"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:495
+#, fuzzy
+msgid "HP Business Inkjet 2230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:496
+#, fuzzy
+msgid "HP Business Inkjet 2250"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+#, fuzzy
+msgid "HP Business Inkjet 2280"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+#, fuzzy
+msgid "HP Color LaserJet 2500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:502
+#, fuzzy
+msgid "HP Color LaserJet 4500"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "HP Color LaserJet 4550"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:504
+#, fuzzy
+msgid "HP Color LaserJet 4600"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:505
+#, fuzzy
+msgid "HP Color LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:506
+#, fuzzy
+msgid "HP Color LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:507
+#, fuzzy
+msgid "HP Color LaserJet 5500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:508
+#, fuzzy
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr "HP DesignJet 430"
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr "HP DesignJet 450C"
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr "HP DesignJet 488CA"
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:516
+#, fuzzy
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:518
+#, fuzzy
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500C"
+
+#: src/main/xmli18n-tmp.h:519
+#, fuzzy
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500C"
+
+#: src/main/xmli18n-tmp.h:520
+#, fuzzy
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:522
+#, fuzzy
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:523
+#, fuzzy
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:526
+#, fuzzy
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:527
+#, fuzzy
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:531
+#, fuzzy
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:532
+#, fuzzy
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:534
+#, fuzzy
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:535
+#, fuzzy
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:536
+#, fuzzy
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:537
+#, fuzzy
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:538
+#, fuzzy
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:539
+#, fuzzy
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:540
+#, fuzzy
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:541
+#, fuzzy
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:542
+#, fuzzy
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:543
+#, fuzzy
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:544
+#, fuzzy
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:545
+#, fuzzy
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:546
+#, fuzzy
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:547
+#, fuzzy
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:548
+#, fuzzy
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:549
+#, fuzzy
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:550
+#, fuzzy
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:551
+#, fuzzy
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:552
+#, fuzzy
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:553
+#, fuzzy
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:554
+#, fuzzy
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:557
+#, fuzzy
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:558
+#, fuzzy
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:559
+#, fuzzy
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:560
+#, fuzzy
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:561
+#, fuzzy
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:563
+#, fuzzy
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr "HP DeskJet 842C"
+
+#: src/main/xmli18n-tmp.h:565
+#, fuzzy
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr "HP DeskJet 850C"
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:570
+#, fuzzy
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:571
+#, fuzzy
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:574
+#, fuzzy
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:575
+#, fuzzy
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:576
+#, fuzzy
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:577
+#, fuzzy
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:578
+#, fuzzy
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:579
+#, fuzzy
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:580
+#, fuzzy
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:581
+#, fuzzy
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:582
+#, fuzzy
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:583
+#, fuzzy
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:584
+#, fuzzy
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:585
+#, fuzzy
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:586
+#, fuzzy
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:587
+#, fuzzy
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:588
+#, fuzzy
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:589
+#, fuzzy
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:590
+#, fuzzy
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:591
+#, fuzzy
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:592
+#, fuzzy
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:593
+#, fuzzy
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:594
+#, fuzzy
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr "HP DeskJet 1100C"
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:597
+#, fuzzy
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:601
+#, fuzzy
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:602
+#, fuzzy
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:603
+#, fuzzy
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:604
+#, fuzzy
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:605
+#, fuzzy
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:606
+#, fuzzy
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:607
+#, fuzzy
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:608
+#, fuzzy
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:609
+#, fuzzy
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:610
+#, fuzzy
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:611
+#, fuzzy
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:612
+#, fuzzy
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet IIP sorozat"
+
+#: src/main/xmli18n-tmp.h:613
+#, fuzzy
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:614
+#, fuzzy
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:615
+#, fuzzy
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:616
+#, fuzzy
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:617
+#, fuzzy
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:618
+#, fuzzy
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:619
+#, fuzzy
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:621
+#, fuzzy
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:622
+#, fuzzy
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:623
+#, fuzzy
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr "HP LaserJet 4Si"
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:626
+#, fuzzy
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:627
+#, fuzzy
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:628
+#, fuzzy
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:629
+#, fuzzy
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:630
+#, fuzzy
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:632
+#, fuzzy
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:633
+#, fuzzy
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:634
+#, fuzzy
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:635
+#, fuzzy
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:636
+#, fuzzy
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:637
+#, fuzzy
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:638
+#, fuzzy
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:639
+#, fuzzy
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:640
+#, fuzzy
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:641
+#, fuzzy
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:642
+#, fuzzy
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:643
+#, fuzzy
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:644
+#, fuzzy
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:645
+#, fuzzy
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:646
+#, fuzzy
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:647
+#, fuzzy
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:648
+#, fuzzy
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:649
+#, fuzzy
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:650
+#, fuzzy
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:651
+#, fuzzy
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:652
+#, fuzzy
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:653
+#, fuzzy
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:654
+#, fuzzy
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:655
+#, fuzzy
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:656
+#, fuzzy
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:657
+#, fuzzy
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:658
+#, fuzzy
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:659
+#, fuzzy
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:660
+#, fuzzy
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:661
+#, fuzzy
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:662
+#, fuzzy
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:663
+#, fuzzy
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:664
+#, fuzzy
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:665
+#, fuzzy
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:666
+#, fuzzy
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:667
+#, fuzzy
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+#, fuzzy
+msgid "HP OfficeJet 300"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:671
+#, fuzzy
+msgid "HP OfficeJet 330"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:672
+#, fuzzy
+msgid "HP OfficeJet 350"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:673
+#, fuzzy
+msgid "HP OfficeJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:674
+#, fuzzy
+msgid "HP OfficeJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:675
+#, fuzzy
+msgid "HP OfficeJet 570"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:676
+#, fuzzy
+msgid "HP OfficeJet 580"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:677
+#, fuzzy
+msgid "HP OfficeJet 590"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:678
+#, fuzzy
+msgid "HP OfficeJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:679
+#, fuzzy
+msgid "HP OfficeJet 610"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:680
+#, fuzzy
+msgid "HP OfficeJet 625"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:681
+#, fuzzy
+msgid "HP OfficeJet 630"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:682
+#, fuzzy
+msgid "HP OfficeJet 635"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:683
+#, fuzzy
+msgid "HP OfficeJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:684
+#, fuzzy
+msgid "HP OfficeJet 710"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:685
+#, fuzzy
+msgid "HP OfficeJet 720"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:686
+#, fuzzy
+msgid "HP OfficeJet 725"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:687
+#, fuzzy
+msgid "HP OfficeJet 5105"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:688
+#, fuzzy
+msgid "HP OfficeJet 5110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:689
+#, fuzzy
+msgid "HP OfficeJet 5110xi"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:690
+#, fuzzy
+msgid "HP OfficeJet 6105"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:691
+#, fuzzy
+msgid "HP OfficeJet 6110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:692
+#, fuzzy
+msgid "HP OfficeJet 7110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:693
+#, fuzzy
+msgid "HP OfficeJet 7130"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:694
+#, fuzzy
+msgid "HP OfficeJet 7140"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:695
+#, fuzzy
+msgid "HP OfficeJet D125"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+#, fuzzy
+msgid "HP OfficeJet D145"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:698
+#, fuzzy
+msgid "HP OfficeJet D155"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:699
+#, fuzzy
+msgid "HP OfficeJet G55"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:700
+#, fuzzy
+msgid "HP OfficeJet G85"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:701
+#, fuzzy
+msgid "HP OfficeJet G95"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:702
+#, fuzzy
+msgid "HP OfficeJet K60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:703
+#, fuzzy
+msgid "HP OfficeJet K60xi"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:704
+#, fuzzy
+msgid "HP OfficeJet K80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:705
+#, fuzzy
+msgid "HP OfficeJet K80xi"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:706
+#, fuzzy
+msgid "HP OfficeJet LX"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:707
+#, fuzzy
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:708
+#, fuzzy
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+#, fuzzy
+msgid "HP OfficeJet R40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:711
+#, fuzzy
+msgid "HP OfficeJet R45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:712
+#, fuzzy
+msgid "HP OfficeJet R60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:713
+#, fuzzy
+msgid "HP OfficeJet R65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:714
+#, fuzzy
+msgid "HP OfficeJet R80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:715
+#, fuzzy
+msgid "HP OfficeJet T45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:716
+#, fuzzy
+msgid "HP OfficeJet T65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:717
+#, fuzzy
+msgid "HP OfficeJet V40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:718
+#, fuzzy
+msgid "HP OfficeJet V40xi"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+#, fuzzy
+msgid "HP PSC 2110"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+#, fuzzy
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:730
+#, fuzzy
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:731
+#, fuzzy
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:732
+#, fuzzy
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:733
+#, fuzzy
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:734
+#, fuzzy
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:735
+#, fuzzy
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:738
+#, fuzzy
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:739
+#, fuzzy
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:740
+#, fuzzy
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:741
+#, fuzzy
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/main/xmli18n-tmp.h:796
+#, fuzzy
+msgid "Lexmark Optra E"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+#, fuzzy
+msgid "Sony IJP-V100"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Nyomtató beállítása"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/main/xmli18n-tmp.h:867
+#, fuzzy
+msgid "Olympus P-10"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:868
+#, fuzzy
+msgid "Olympus P-11"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:869
+#, fuzzy
+msgid "Olympus P-200"
+msgstr "Olympus P200"
+
+#: src/main/xmli18n-tmp.h:870
+#, fuzzy
+msgid "Olympus P-300"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:871
+#, fuzzy
+msgid "Olympus P-300E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:872
+#, fuzzy
+msgid "Olympus P-300U"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:873
+#, fuzzy
+msgid "Olympus P-330E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:874
+#, fuzzy
+msgid "Olympus P-330NE"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:875
+#, fuzzy
+msgid "Olympus P-400"
+msgstr "Olympus P400"
+
+#: src/main/xmli18n-tmp.h:876
+#, fuzzy
+msgid "Olympus P-440"
+msgstr "Olympus P440"
+
+#: src/main/xmli18n-tmp.h:877
+#, fuzzy
+msgid "Canon CP-100"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:878
+#, fuzzy
+msgid "Canon CP-200"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:879
+#, fuzzy
+msgid "Canon CP-220"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:880
+#, fuzzy
+msgid "Canon CP-300"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:881
+#, fuzzy
+msgid "Canon CP-330"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:882
+#, fuzzy
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:883
+#, fuzzy
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:884
+#, fuzzy
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:885
+#, fuzzy
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:886
+#, fuzzy
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:888
+#, fuzzy
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:889
+#, fuzzy
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix CX-400"
+
+#: src/main/xmli18n-tmp.h:890
+#, fuzzy
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix CX-550"
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr "NYERS ADAT 16 bit"
+
+#: src/main/xmli18n-tmp.h:892
+msgid "RAW DATA 8 bit"
+msgstr "NYERS ADAT 8 bit"
+
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+msgid "Inch"
+msgstr "Hüvelyk"
+
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+msgid "Set the base unit of measurement to inches"
+msgstr "Az alapmértékegység hüvelykre állítása"
+
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Az alapmértékegység centiméterre állítása"
+
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+msgid "Points"
+msgstr "Pont"
+
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Az alapmértékegység pontra (1/72 hüvelyk) állítása"
+
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Az alapmértékegység milliméterre állítása"
+
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+msgid "Pica"
+msgstr "Pica"
+
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Az alapmértékegység pica-ra (1/12 hüvelyk) állítása"
+
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+msgid "Color output"
+msgstr "Színes kimenet"
+
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+msgid "Print in shades of gray using black ink"
+msgstr "A szürke szín árnyalataival való nyomtatás fekete tintával"
+
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+msgid "Standard Command"
+msgstr "Szabványos parancs"
+
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+msgid "Use standard print command"
+msgstr "Szabványos nyomtatóparancs használata"
+
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+msgid "Custom Command"
+msgstr "Egyéni parancs"
+
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+msgid "Use custom print command"
+msgstr "Egyéni nyomtatóparancs használata"
+
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+msgid "File"
+msgstr "Fájl"
+
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+msgid "Print to a file"
+msgstr "Nyomtatás fájlba"
+
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+msgid "Edit Curve..."
+msgstr "Görbe szerkesztése..."
+
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+msgid "Set Default"
+msgstr "Alapértelmezés beállítása"
+
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+msgid "Restore Previous"
+msgstr "Előző helyreállítása"
+
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+msgid "OK"
+msgstr "OK"
+
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- nyomtatás v%s"
+
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+msgid "About"
+msgstr "Névjegy"
+
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Nyomtatás és a\n"
+"beállítások mentése"
+
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Beállítások\n"
+"mentése"
+
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+msgid "Print"
+msgstr "Nyomtatás"
+
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+msgid "Preview"
+msgstr "Előnézet"
+
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+msgid ""
+"Position the image on the page.\n"
+"Click and drag with the primary button to position the image.\n"
+"Click and drag with the second button to move the image with finer "
+"precision; each unit of motion moves the image one point (1/72\")\n"
+"Click and drag with the third (middle) button to move the image in units of "
+"the image size.\n"
+"Holding down the shift key while clicking and dragging constrains the image "
+"to only horizontal or vertical motion.\n"
+"If you click another button while dragging the mouse, the image will return "
+"to its original position."
+msgstr ""
+"A kép elhelyezése a lapon.\n"
+"Az elsődleges (általában a bal oldali) egérgomb lenyomása utáni húzással "
+"áthelyezheti a képet.\n"
+"A második egérgomb lenyomása utáni húzással finomabb áthelyezés végezhető; "
+"az elmozdítás pontonként történik (1/72\").\n"
+"A harmadik (középső) egérgomb lenyomása utáni húzással képméretnyi "
+"elmozdítás végezhető.\n"
+"Ha kattintás és húzás közben le van nyomva a Shift billentyű, akkor az "
+"elmozdítás csak vízszintes illetve függőleges irányban lesz lehetséges.\n"
+"Ha húzás közben lenyom egy másik egérgombot, akkor a kép visszakerül az "
+"eredeti helyére."
+
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+msgid "Paper Size"
+msgstr "Papírméret"
+
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+msgid "Show All Paper Sizes"
+msgstr "Minden papírméret mutatása"
+
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+msgid "Dimensions:"
+msgstr "Méretek:"
+
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+msgid "Width:"
+msgstr "Szélesség:"
+
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+msgid "Width of the paper that you wish to print to"
+msgstr "A nyomtatáshoz használt papír szélessége"
+
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+msgid "Height:"
+msgstr "Magasság:"
+
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+msgid "Height of the paper that you wish to print to"
+msgstr "A nyomtatáshoz használt papír magassága"
+
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+msgid "Automatic Paper Size"
+msgstr "Automatikus papírméret"
+
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+msgid "Number of Copies"
+msgstr "Példányszám"
+
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Válassza ki a nyomtatandó példányok számát, 1 és 100 között"
+
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+msgid "Image Position"
+msgstr "Képpozíció"
+
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+msgid "Auto"
+msgstr "Automatikus"
+
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+msgid "Portrait"
+msgstr "�lló"
+
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+msgid "Landscape"
+msgstr "Fekvő"
+
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+msgid "Upside down"
+msgstr "Fejjel lefelé"
+
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+msgid "Seascape"
+msgstr "Ellenkező fekvő"
+
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Válasszon irányt: álló, fekvő, fejjel lefelé levő vagy fordított fekvő "
+"(fejjel lefelé levő fekvő)"
+
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+msgid "Orientation:"
+msgstr "Elhelyezkedés:"
+
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+msgid "Left:"
+msgstr "Bal:"
+
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+msgid "Distance from the left of the paper to the image"
+msgstr "A képnek a papír bal oldalától mért távolsága"
+
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+msgid "Right:"
+msgstr "Jobb:"
+
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "A kép jobb oldalának a papír bal oldalától mért távolsága"
+
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+msgid "Distance from the right of the paper to the image"
+msgstr "A képnek a papír jobb oldalától mért távolsága"
+
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+msgid "Top:"
+msgstr "Fent:"
+
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+msgid "Distance from the top of the paper to the image"
+msgstr "A képnek a papír tetejétől mért távolsága"
+
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+msgid "Bottom:"
+msgstr "Lent:"
+
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "A kép aljának a papír tetejétől mért távolsága"
+
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+msgid "Distance from the bottom of the paper to the image"
+msgstr "A képnek a papír aljától mért távolsága"
+
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+msgid "Center:"
+msgstr "Középre:"
+
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+msgid "Horizontal"
+msgstr "Vízszintes"
+
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+msgid "Center the image horizontally on the paper"
+msgstr "A kép középre igazítása vízszintes irányban a papíron"
+
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+msgid "Both"
+msgstr "Mindkettő"
+
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+msgid "Center the image on the paper"
+msgstr "A kép középre igazítása a papíron"
+
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+msgid "Vertical"
+msgstr "Függőleges"
+
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+msgid "Center the image vertically on the paper"
+msgstr "A kép középre igazítása függőleges irányban a papíron"
+
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+msgid "Setup Printer"
+msgstr "Nyomtató beállítása"
+
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+msgid "Printer Make:"
+msgstr "Nyomtató gyártója:"
+
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+msgid "Select the make of your printer"
+msgstr "Válassza ki a nyomtató gyártóját"
+
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+msgid "Printer Model:"
+msgstr "Nyomtató típusa:"
+
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+msgid "Select your printer model"
+msgstr "Válassza ki a nyomtató típusát"
+
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+msgid "PPD File:"
+msgstr "PPD fájl:"
+
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Adja meg a nyomtatóhoz tartozó PPD fájl nevét"
+
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+msgid "Browse"
+msgstr "Tallózás"
+
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Válassza ki a nyomtatóhoz tartozó PPD fájl nevét"
+
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+msgid ""
+"Select the name of the output queue (not the type, or model, of printer) "
+"that you wish to print to"
+msgstr ""
+"Adja meg azon kimeneti sor nevét (ne a nyomtató típusát vagy a modelljét), "
+"amelyikbe nyomtatni kíván"
+
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+msgid "Printer Queue:"
+msgstr "Nyomtatási sor:"
+
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+msgid "Enter the correct command to print to your printer. "
+msgstr "Adja meg a nyomtatójára való nyomtatáshoz használandó parancsot. "
+
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+msgid "Enter the file to print to. "
+msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. "
+
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+msgid "File to print to"
+msgstr "Nyomtatás ebbe a fájlba"
+
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+msgid "Print To File"
+msgstr "Nyomtatás fájlba"
+
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+msgid "Define New Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+msgid "Printer Name:"
+msgstr "Nyomtató neve:"
+
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Adja meg a logikai nyomtatóhoz használandó nevet"
+
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+msgid "About Gutenprint "
+msgstr "A Gutenprint névjegye "
+
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+msgid "Gutenprint Version "
+msgstr "Gutenprint verzió: "
+
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+msgid ""
+"\n"
+"\n"
+"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+"and the rest of the Gutenprint Development Team.\n"
+"\n"
+"Please visit our web site at http://gimp-print.sourceforge.net.\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+msgstr ""
+"\n"
+"\n"
+"Copyright (C) 1997-2001, Michael Sweet, Robert Krawitz\n"
+"és a Gutenprint fejlesztőcsapat többi tagja.\n"
+"\n"
+"A szerzők weblapja: http://gimp-print.sourceforge.net\n"
+"\n"
+"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
+"a Free Software Foundation által publikált GNU General Public\n"
+"License 2. vagy annál újabb verziója alapján.\n"
+"\n"
+"A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
+"bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
+"egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
+"részletek a GNU General Public License-ben.\n"
+"\n"
+"A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
+"Public License-ből; ha nem így történt, írjon a következő címre:\n"
+"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
+"MA 02111-1307, USA.\n"
+
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+msgid "Printer Settings"
+msgstr "Nyomtató beállításai"
+
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+msgid ""
+"Select the name of the printer (not the type, or model, of printer) that you "
+"wish to print to"
+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:1884 src/gutenprintui2/panel.c:1883
+msgid "Setup Printer..."
+msgstr "Nyomtató beállítása..."
+
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+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:1899 src/gutenprintui2/panel.c:1898
+msgid "New Printer..."
+msgstr "Új nyomtató..."
+
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+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 ""
+"Ú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:1943 src/gutenprintui2/panel.c:1942
+msgid "Image Size"
+msgstr "Képméret"
+
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+msgid "Scaling:"
+msgstr "Méretezés:"
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+msgid "Set the scale (size) of the image"
+msgstr "Megadja a kép méretezését (méretét)"
+
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+msgid "Scale by:"
+msgstr "Méretezés:"
+
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+msgid ""
+"Select whether scaling is measured as percent of available page size or "
+"number of output dots per inch"
+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:2002 src/gutenprintui2/panel.c:2001
+msgid "Percent"
+msgstr "Százalék"
+
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+msgid "Scale the print to the size of the page"
+msgstr "Nyomat méretezése a lap mérete szerint"
+
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+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:2034 src/gutenprintui2/panel.c:2033
+msgid "Set the width of the print"
+msgstr "A nyomat szélessége"
+
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+msgid "Set the height of the print"
+msgstr "A nyomat magassága"
+
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Eredeti képméret\n"
+"használata"
+
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+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:2071 src/gutenprintui2/panel.c:2071
+msgid "Print Color Adjust"
+msgstr "Nyomat színeinek beállítása"
+
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+msgid "Set Defaults"
+msgstr "Alapértelmezések beállítása"
+
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+msgid "Close"
+msgstr "Bezárás"
+
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+msgid "Image preview"
+msgstr "Előnézeti kép"
+
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+msgid "View Output Channels:"
+msgstr "Kimeneti csatornák megjelenítése:"
+
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+msgid "Output"
+msgstr "Kimenet"
+
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+msgid "Output Type:"
+msgstr "Kimenet típusa:"
+
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+msgid "Select the desired output type"
+msgstr "Válassza ki a kívánt kimeneti típust"
+
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+msgid "Adjust Output..."
+msgstr "Kimenet beállítása..."
+
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+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:2285 src/gutenprintui2/panel.c:2291
+msgid "Size Units:"
+msgstr "Mértékegységek:"
+
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+msgid " "
+msgstr " "
+
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+msgid "Units:"
+msgstr "Mértékegységek:"
+
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+msgid "Select the base unit of measurement for printing"
+msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
+
+#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
+#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+msgid "System V lp"
+msgstr "System V lp"
+
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+msgid "CUPS"
+msgstr "CUPS"
+
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+msgid "Berkeley lpd (/etc/lpc)"
+msgstr "Berkeley lpd (/etc/lpc)"
+
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+msgid "Berkeley lpd (/usr/bsd/lpc)"
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
+
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+msgid "Berkeley lpd (/usr/etc/lpc"
+msgstr "Berkeley lpd (/usr/etc/lpc"
+
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+msgid "Berkeley lpd (/usr/libexec/lpc)"
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
+
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+msgid "Berkeley lpd (/usr/sbin/lpc)"
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
+
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+msgid "Printer"
+msgstr "Nyomtató"
+
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+msgid "(Default Printer)"
+msgstr "(Alapértelmezett nyomtató)"
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Görbetípus"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "A görbe lineáris, spline-interpolált vagy szabadkézi-e"
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimális X"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "X minimális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maximum X"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "X maximális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimális Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Y minimális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maximum Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Y maximális lehetséges értéke"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma érték"
+
+#: src/cups/genppd.c:133
+msgid "Printer Features"
+msgstr "Nyomtató szolgáltatásai"
+
+#: src/cups/genppd.c:134
+msgid "Output Control"
+msgstr "Kimenetvezérlés"
+
+#: src/cups/genppd.c:139
+msgid "Common"
+msgstr "Közös"
+
+#: src/cups/genppd.c:140
+msgid "Extra 1"
+msgstr "1. extra"
+
+#: src/cups/genppd.c:141
+msgid "Extra 2"
+msgstr "2. extra"
+
+#: src/cups/genppd.c:142
+msgid "Extra 3"
+msgstr "3. extra"
+
+#: src/cups/genppd.c:143
+msgid "Extra 4"
+msgstr "4. extra"
+
+#: src/cups/genppd.c:144
+msgid "Extra 5"
+msgstr "5. extra"
+
+#. TRANSLATORS: "Gutenprint" is a proper name, not a description
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
+msgid "Gutenprint"
+msgstr "Gutenprint"
+
+#: src/cups/genppd.c:890
+msgid "English"
+msgstr "Hungarian"
+
+#: src/cups/genppd.c:892
+msgid "ISOLatin1"
+msgstr "ISOLatin2"
+
+#: src/cups/genppd.c:1467
+msgid "No"
+msgstr "Nem"
+
+#: src/cups/genppd.c:1469
+msgid "Yes"
+msgstr "Igen"
+
+#: src/cups/genppd.c:1499
+msgid "Fine Adjustment"
+msgstr "Finomhangolás"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil verzió "
+
+#: src/escputil/escputil.c:71
+#, fuzzy
+msgid ""
+", Copyright (C) 2000-2006 Robert Krawitz\n"
+"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
+"This is free software, and you are welcome to redistribute it\n"
+"under certain conditions; type 'escputil -l' for details.\n"
+msgstr ""
+", Copyright (C) 2000-2003 Robert Krawitz\n"
+"Az Escputil-ra NINCS GARANCIA, a részletekért adja ki a következő "
+"parancsot:\n"
+" 'escputil -l'\n"
+"Ez egy szabad szoftver és örülünk, ha bizonyos feltételek mellett "
+"terjeszti,\n"
+"a részletekért adja ki a következő parancsot: 'escputil -l'.\n"
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"\n"
+"\n"
+"Copyright (C) 1997-2001, Michael Sweet, Robert Krawitz\n"
+"és a Gutenprint fejlesztőcsapat többi tagja.\n"
+"\n"
+"A szerzők weblapja: http://gimp-print.sourceforge.net\n"
+"\n"
+"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
+"a Free Software Foundation által publikált GNU General Public\n"
+"License 2. vagy annál újabb verziója alapján.\n"
+"\n"
+"A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
+"bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
+"egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
+"részletek a GNU General Public License-ben.\n"
+"\n"
+"A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
+"Public License-ből; ha nem így történt, írjon a következő címre:\n"
+"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
+"MA 02111-1307, USA.\n"
+
+#: src/escputil/escputil.c:119
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Commands:\n"
+"    -c|--clean-head    Clean the print head.\n"
+"    -n|--nozzle-check  Print a nozzle test pattern.\n"
+"                       Dirty or clogged nozzles will show as gaps in the\n"
+"                       pattern.  If you see any gaps, you should clean\n"
+"                       the print head.\n"
+"    -a|--align-head    Align the print head.  CAUTION: Misuse of this\n"
+"                       utility may result in poor print quality and/or\n"
+"                       damage to the printer.\n"
+"    -s|--status        Retrieve printer status.\n"
+"    -i|--ink-level     Obtain the ink level from the printer.  This "
+"requires\n"
+"                       read/write access to the raw printer device.\n"
+"    -e|--extended-ink-info     Obtain the extended ink information from the\n"
+"                       printer.  This requires read/write access to the raw\n"
+"                       printer device.\n"
+"    -d|--identify      Query the printer for make and model information.\n"
+"                       This requires read/write access to the raw printer\n"
+"                       device.\n"
+"    -l|--license       Display the license/warranty terms of this program.\n"
+"    -M|--list-models   List the available printer models.\n"
+"    -h|--help          Print this help message.\n"
+"  Options:\n"
+"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
+"                       Default is the default system printer.\n"
+"    -r|--raw-device    Specify the name of the device to write to directly\n"
+"                       rather than going through a printer queue.\n"
+"    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
+"                       newer).  Only needed when not using a raw device.\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
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\n"
+"  Commands:\n"
+"    -c Clean the print head.\n"
+"    -n Print a nozzle test pattern.\n"
+"          Dirty or clogged nozzles will show as gaps in the\n"
+"          pattern.  If you see any gaps, you should clean\n"
+"          the print head.\n"
+"    -a Align the print head.  CAUTION: Misuse of this\n"
+"          utility may result in poor print quality and/or\n"
+"          damage to the printer.\n"
+"    -s Retrieve printer status.\n"
+"    -i Obtain the ink level from the printer.  This requires\n"
+"          read/write access to the raw printer device.\n"
+"    -e Obtain the extended ink information from the printer.\n"
+"          Only for R800 printer and friends. This requires\n"
+"          read/write access to the raw printer device.\n"
+"    -d Query the printer for make and model information.  This\n"
+"          requires read/write access to the raw printer device.\n"
+"    -l Display the license/warranty terms of this program.\n"
+"    -M List the available printer models.\n"
+"    -h Print this help message.\n"
+"  Options:\n"
+"    -P Specify the name of the printer queue to operate on.\n"
+"          Default is the default system printer.\n"
+"    -r Specify the name of the device to write to directly\n"
+"          rather than going through a printer queue.\n"
+"    -u The printer is a new printer (Stylus Color 740 or newer).\n"
+"          Only needed when not using a raw device.\n"
+"    -q Suppress the banner.\n"
+"    -S Print the short name of the printer with -d.\n"
+"    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#, 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
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Csak egy nyomtatótípust adhat meg."
+
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Ismeretlen kapcsoló: %c\n"
+
+#: src/escputil/escputil.c:389
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Használat: %s [KAPCSOLÓK] parancs\n"
+
+#: src/escputil/escputil.c:391
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
+#, 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:781 src/escputil/escputil.c:1408
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "A(z) %s nem írható: %s\n"
+
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"A(z) %s nem írható: %s\n"
+
+#: src/escputil/escputil.c:869
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"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:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Telítettség"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Hiba a bemenetben\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Hiba a bemenetben\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, fuzzy, c-format
+msgid "Ink Levels:\n"
+msgstr "tintaszintek"
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink color"
+msgstr "Tinta színe"
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr "tintaszintek"
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr "állapot"
+
+#: src/escputil/escputil.c:1339
+#, 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:1451
+#, 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:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Part number"
+msgstr "Rész száma"
+
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
+msgid "Date"
+msgstr "Dátum"
+
+#: 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:1689
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "A nyomtatótípus nem azonosítható.\n"
+
+#: src/escputil/escputil.c:1709
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Fejek tisztítása...\n"
+
+#: src/escputil/escputil.c:1724
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+"Fúvókateszt futtatása, győződjön meg róla, hogy van papír a nyomtatóban.\n"
+
+#: src/escputil/escputil.c:1728
+#, c-format
+msgid ""
+"Please read these instructions very carefully before proceeding.\n"
+"\n"
+"This utility lets you align the print head of your Epson Stylus inkjet\n"
+"printer.  Misuse of this utility may cause your print quality to degrade\n"
+"and possibly damage your printer.  This utility has not been reviewed by\n"
+"Seiko Epson for correctness, and is offered with no warranty at all.  The\n"
+"entire risk of using this utility lies with you.\n"
+"\n"
+"This utility prints %d test patterns.  Each pattern looks very similar.\n"
+"The patterns consist of a series of pairs of vertical lines that overlap.\n"
+"Below each pair of lines is a number between %d and %d.\n"
+"\n"
+"When you inspect the pairs of lines, you should find the pair of lines that\n"
+"is best in alignment, that is, that best forms a single vertical line.\n"
+"Inspect the pairs very carefully to find the best match.  Using a loupe\n"
+"or magnifying glass is recommended for the most critical inspection.\n"
+"It is also suggested that you use a good quality paper for the test,\n"
+"so that the lines are well-formed and do not spread through the paper.\n"
+"After picking the number matching the best pair, place the paper back in\n"
+"the paper input tray before typing it in.\n"
+"\n"
+"Each pattern is similar, but later patterns use finer dots for more\n"
+"critical alignment.  You must run all of the passes to correctly align your\n"
+"printer.  After running all the alignment passes, the alignment\n"
+"patterns will be printed once more.  You should find that the middle-most\n"
+"pair (#%d out of the %d) is the best for all patterns.\n"
+"\n"
+"After the passes are printed once more, you will be offered the\n"
+"choices of (s)aving the result in the printer, (r)epeating the process,\n"
+"or (q)uitting without saving.  Quitting will not restore the previous\n"
+"settings, but powering the printer off and back on will.  If you quit,\n"
+"you must repeat the entire process if you wish to later save the results.\n"
+"It is essential that you not turn your printer off during this procedure.\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1763
+#, c-format
+msgid ""
+"Please read these instructions very carefully before proceeding.\n"
+"\n"
+"This utility lets you align the print head of your Epson Stylus inkjet\n"
+"printer.  Misuse of this utility may cause your print quality to degrade\n"
+"and possibly damage your printer.  This utility has not been reviewed by\n"
+"Seiko Epson for correctness, and is offered with no warranty at all.  The\n"
+"entire risk of using this utility lies with you.\n"
+"\n"
+"This utility prints a test pattern that consist of a series of pairs of\n"
+"vertical lines that overlap.  Below each pair of lines is a number between\n"
+"%d and %d.\n"
+"\n"
+"When you inspect the pairs of lines, you should find the pair of lines that\n"
+"is best in alignment, that is, that best forms a single vertical align.\n"
+"Inspect the pairs very carefully to find the best match.  Using a loupe\n"
+"or magnifying glass is recommended for the most critical inspection.\n"
+"It is also suggested that you use a good quality paper for the test,\n"
+"so that the lines are well-formed and do not spread through the paper.\n"
+"After picking the number matching the best pair, place the paper back in\n"
+"the paper input tray before typing it in.\n"
+"\n"
+"After running the alignment pattern, it will be printed once more.  You\n"
+"should find that the middle-most pair (#%d out of the %d) is the best.\n"
+"You will then be offered the choices of (s)aving the result in the printer,\n"
+"(r)epeating the process, or (q)uitting without saving.  Quitting will not\n"
+"restore the previous settings, but powering the printer off and back on "
+"will.\n"
+"If you quit, you must repeat the entire process if you wish to later save\n"
+"the results.  It is essential that you not turn off your printer during\n"
+"this procedure.\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1807
+#, c-format
+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:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
+#, c-format
+msgid ""
+"Please inspect the final output very carefully to ensure that your\n"
+"printer is in proper alignment. You may now:\n"
+"  (s)ave the results in the printer,\n"
+"  (q)uit without saving the results, or\n"
+"  (r)epeat the entire process from the beginning.\n"
+"You will then be asked to confirm your choice.\n"
+"What do you want to do (s, q, r)?\n"
+msgstr ""
+"Vizsgálja meg alaposan a végső kimenetet, hogy megbizonyosodjon\n"
+"arról, hogy a nyomtatójának igazítása megfelelő. Ezután:\n"
+"  elmentheti az eredményeket a nyomtatóra (s)\n"
+"  kiléphet az eredmények mentése nélkül (q)\n"
+"  megismételheti az egész folyamatot az elejétől (r).\n"
+"Ezután a program a válasz megerősítését fogja kérni.\n"
+"Mit szeretne tenni (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1839
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"A \"q\" betű lenyomásával erősítse meg hogy mentés nélkül kíván kilépni:\n"
+
+#: src/escputil/escputil.c:1846
+#, c-format
+msgid ""
+"OK, your printer is aligned, but the alignment has not been saved.\n"
+"If you wish to save the alignment, you must repeat this process.\n"
+msgstr ""
+"Rendben, a nyomtató igazítva van, de az igazítás nincs mentve.\n"
+"Ha menteni kívánja az igazítást, akkor meg kell ismételnie ezt a "
+"folyamatot.\n"
+
+#: src/escputil/escputil.c:1853
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Az \"r\" betű lenyomásával erősítse meg, hogy meg kívánja ismételni az "
+"igazítási folyamatot:\n"
+
+#: src/escputil/escputil.c:1861
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Az igazítási folyamat megismétlése.\n"
+
+#: src/escputil/escputil.c:1867
+#, c-format
+msgid ""
+"This will permanently alter the configuration of your printer.\n"
+"WARNING: this procedure has not been approved by Seiko Epson, and\n"
+"it may damage your printer. Proceed?\n"
+"Please confirm by typing 's' again that you wish to save the settings\n"
+"to your printer:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1879
+#, c-format
+msgid "About to save settings..."
+msgstr "A beállítások mentése..."
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid "failed!\n"
+msgstr "meghiúsult!\n"
+
+#: src/escputil/escputil.c:1886
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"A beállítások mentése meghiúsult. Ismételje meg az igazítási folyamatot.\n"
+
+#: src/escputil/escputil.c:1890
+#, c-format
+msgid "succeeded!\n"
+msgstr "sikerült!\n"
+
+#: src/escputil/escputil.c:1891
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr "Az igazítási beállítások mentése a nyomtatóra sikeres.\n"
+
+#: src/escputil/escputil.c:1896
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Azonosítatlan parancs.\n"
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Az utolsó parancsot nem erősítette meg.\n"
+
+#: src/escputil/escputil.c:1904
+#, c-format
+msgid ""
+"This procedure assumes that your printer is an Epson %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"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
+msgid "Press enter to continue > "
+msgstr "Üssön enter-t a folytatáshoz > "
+
+#: src/escputil/escputil.c:1976
+#, c-format
+msgid ""
+"Please inspect the print, and choose the best pair of lines in each "
+"pattern.\n"
+"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
+msgstr ""
+"Vizsgálja meg a nyomatot és válassza ki a legjobb sorpárt minden egyes "
+"mintában.\n"
+"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:1989
+#, c-format
+msgid "Pass #%d"
+msgstr "#%d. menet"
+
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Helyezzen be egy üres lapot.\n"
+
+#: src/escputil/escputil.c:2016
+#, c-format
+msgid "Number out of range!\n"
+msgstr "A szám kívül esik a tartományon!\n"
+
+#: src/escputil/escputil.c:2021
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Nem értelmezhető, amit írt!\n"
+
+#: src/escputil/escputil.c:2027
+#, 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:2034
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Kísérlet az igazítás beállítására..."
+
+#: src/escputil/escputil.c:2037
+#, c-format
+msgid "succeeded.\n"
+msgstr "sikeres.\n"
+
+#: src/escputil/escputil.c:2038
+#, c-format
+msgid ""
+"Please verify that the alignment is correct.  After the alignment pattern\n"
+"is printed again, please ensure that the best pattern for each line is\n"
+"pattern %d.  If it is not, you should repeat the process to get the best\n"
+"quality printing.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Error in input\n"
+msgstr "Hiba a bemenetben\n"
+
+#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Nyomtatás..."
+
+#: src/gimp/print.c:133 src/gimp2/print.c:137
+msgid "<Image>/File/Print..."
+msgstr "<Image>/Fájl/Nyomtatás..."
+
+#: src/ghost/ijsgutenprint.c:98
+#, c-format
+msgid ""
+"ijsgutenprint: the version of Gutenprint software installed (%s)\n"
+"  does not match the PPD file (%s).  If you have upgraded your version\n"
+"  of Gutenprint recently, you must reinstall all printer queues.\n"
+"  Please refer to your vendor's documentation or the ``foomatic-ppdfile''\n"
+"  command for instructions.\n"
+"ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
+"not match the PPD file (%s).\n"
+msgstr ""
+
+#: src/ghost/ijsgutenprint.c:190
+#, c-format
+msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
+msgstr "HIBA: ijsgutenprint: Hibás színtér: bps: %d, csatorna: %d, tér: %s\n"
+
+#: src/ghost/ijsgutenprint.c:198
+#, c-format
+msgid "ERROR: ijsgutenprint: No row buffer\n"
+msgstr "HIBA: ijsgutenprint: Nincs sorpuffer\n"
+
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#, c-format
+msgid ""
+"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
+msgstr ""
+"HIBA: ijsgutenprint: A(z) %s=%s paraméter nem dolgozható fel (a rendszer egy "
+"számot várt)\n"
+
+#: src/ghost/ijsgutenprint.c:497
+#, c-format
+msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
+msgstr ""
+"HIBA: ijsgutenprint: A nyomtatót a -sDeviceModel paranccsal kell megadni\n"
+
+#: src/ghost/ijsgutenprint.c:499
+#, c-format
+msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
+msgstr "HIBA: ijsgutenprint: A(z) %s nyomtató egy ismeretlen típus\n"
+
+#: src/ghost/ijsgutenprint.c:655
+#, c-format
+msgid "ijsgutenprint: unknown DeviceModel %s\n"
+msgstr "ijsgutenprint: ismeretlen DeviceModel: %s\n"
+
+#: src/ghost/ijsgutenprint.c:699
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
+msgstr "HIBA: ijsgutenprint: a TopLeft %s értéke nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:722
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
+msgstr "HIBA: ijsgutenprint: a PaperSize %s értéke nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:794
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
+msgstr "HIBA: ijsgutenprint: a(z) %s görbe nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:801
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
+msgstr "HIBA: ijsgutenprint: a(z) %s lebegőpontos %s nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:808
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
+msgstr "HIBA: ijsgutenprint: a(z) %s egész %s nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:815
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
+msgstr "HIBA: ijsgutenprint: a(z) %s %s mérete nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:829
+#, c-format
+msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
+msgstr "HIBA: ijsgutenprint: a(z) %s logikai %s nem dolgozható fel\n"
+
+#: src/ghost/ijsgutenprint.c:840
+#, c-format
+msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
+msgstr "HIBA: ijsgutenprint: Hibás paraméter: %s %d\n"
+
+#: src/ghost/ijsgutenprint.c:866
+#, c-format
+msgid "ERROR: ijsgutenprint: bad key code %d\n"
+msgstr "HIBA: ijsgutenprint: hibás billentyűkód: %d\n"
+
+#: src/ghost/ijsgutenprint.c:1303
+#, c-format
+msgid "ERROR: ijsgutenprint: image_init failed %d\n"
+msgstr "HIBA: ijsgutenprint: image_init meghiúsult %d\n"
+
+#: src/ghost/ijsgutenprint.c:1314
+#, c-format
+msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
+msgstr "HIBA: ijsgutenprint: A következő fájlleíró nem nyitható meg: %s\n"
+
+#: src/ghost/ijsgutenprint.c:1326
+#, c-format
+msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
+msgstr "HIBA: ijsgutenprint: Nem lehet megnyitni a(z) %s-t: %s\n"
+
+#: src/ghost/ijsgutenprint.c:1338
+#, c-format
+msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
+msgstr "HIBA: ijsgutenprint: Ismeretlen nyomtató: %s\n"
+
+#: src/ghost/ijsgutenprint.c:1508
+#, c-format
+msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
+msgstr "HIBA: ijsgutenprint: Hibás paraméterek, nem lehet folytatni!\n"
+
+#: src/ghost/ijsgutenprint.c:1526
+#, c-format
+msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+msgstr "HIBA: ijsgutenprint: A következő sor lekérése meghiúsult itt: %.0f\n"
+
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "HIBA: ijsgutenprint: ijs_server_get_page_header meghiúsult: %d\n"
+
+#~ msgid "Red and Blue Ink Usage"
+#~ msgstr "Vörös és két tinta használata"
+
+#~ msgid "Amount of red and blue ink to use"
+#~ msgstr "A használandó vörös és kék tinta mennyisége"
+
+#~ msgid "Canon BJC 4400 photo"
+#~ msgstr "Canon BJC 4400 fotó"
+
+#~ msgid "EPSON Stylus Photo 785EPX"
+#~ msgstr "EPSON Stylus Photo 785EPX"
+
+#~ msgid "EPSON CL-700"
+#~ msgstr "EPSON CL-700"
+
+#~ msgid "EPSON CL-750"
+#~ msgstr "EPSON CL-750"
+
+#~ msgid "EPSON CL-760"
+#~ msgstr "EPSON CL-760"
+
+#~ msgid "EPSON MC-2000"
+#~ msgstr "EPSON MC-2000"
+
+#~ msgid "EPSON MC-7000"
+#~ msgstr "EPSON MC-7000"
+
+#~ msgid "EPSON MC-10000"
+#~ msgstr "EPSON MC-10000"
+
+#~ msgid "EPSON MJ-6000C"
+#~ msgstr "EPSON MJ-6000C"
+
+#~ msgid "HP DeskJet 600/600C"
+#~ msgstr "HP DeskJet 600/600C"
+
+#~ msgid "HP DeskJet 600 series"
+#~ msgstr "HP DeskJet 600 series"
+
+#~ msgid "HP DeskJet 690 series"
+#~ msgstr "HP DeskJet 690 series"
+
+#~ msgid "HP DeskJet 900 series"
+#~ msgstr "HP DeskJet 900 sorozat"
+
+#~ msgid "HP DeskJet 2000 series"
+#~ msgstr "HP DeskJet 2000 sorozat"
+
+#~ msgid "HP DeskJet 2500 series"
+#~ msgstr "HP DeskJet 2500 sorozat"
+
+#~ msgid "HP LaserJet II series"
+#~ msgstr "HP LaserJet II sorozat"
+
+#~ msgid "HP LaserJet III series"
+#~ msgstr "HP LaserJet III sorozat"
+
+#~ msgid "HP LaserJet 4 series"
+#~ msgstr "HP LaserJet 4 sorozat"
+
+#~ msgid "HP LaserJet 5 series"
+#~ msgstr "HP LaserJet 5 sorozat"
+
+#~ msgid "HP LaserJet 6 series"
+#~ msgstr "HP LaserJet 6 sorozat"
+
+#~ msgid "unknown"
+#~ msgstr "ismeretlen"
+
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "A nyomtató nem azonosítható\n"
+
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "A nyomtató nem támogatja a tintatípusok felsorolását.\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index 8f4c23a..aa86ffc 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 474c552..8e309b2 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-10-07 19:10+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "½é´üÃͤËÌ᤹"
@@ -77,12 +77,12 @@ msgstr ""
 msgid "Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -147,207 +147,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "¥Ç¥£¥¶Êý¼°"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "ÇØ·Ê°õºþÍÑ¥Õ¥£¥ë¥à"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Á¡°Ý¼Á¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "ÉõÅû"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "¹â²òÁüÅÙ¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T-¥·¥ã¥Ä¤ÎÌÏÍÍ"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "¹â±ð¥Õ¥£¥ë¥à"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -355,16 +355,16 @@ msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
 msgid "Other"
 msgstr "¤½¤Î¾"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -381,57 +381,57 @@ msgstr "²èÁü¤Î¥µ¥¤¥º"
 msgid "Basic Printer Setup"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "ÍÑ»æ¤Î¼ïÎà"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "µë»æÊýË¡"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "²òÁüÅÙ"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -440,21 +440,21 @@ msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,14 +464,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -481,168 +481,169 @@ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 msgid "Core Parameter"
 msgstr "ColorLife Paper"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "¼«Æ°µë»æ"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "¹õ¿§"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "¥Õ¥©¥È CcMmYK ¿§"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY ¿§"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "¥Õ¥©¥È CcMmY ¿§"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK ¿§"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "¥Õ¥©¥È CcMmY ¿§"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY ¿§"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "¥Õ¥©¥È CcMmYK ¿§"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "¹õ¿§"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -844,14 +845,15 @@ msgstr "¥¬¥ó¥Þ:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "¥·¥¢¥ó (C)"
 
@@ -860,14 +862,15 @@ msgstr "¥·¥¢¥ó (C)"
 msgid "Adjust the cyan gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
@@ -876,14 +879,15 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
 msgid "Adjust the magenta gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "²«¿§ (Y)"
 
@@ -892,10 +896,10 @@ msgstr "²«¿§ (Y)"
 msgid "Adjust the yellow gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -914,10 +918,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1160,233 +1164,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ¤Ï¼ïÎà %s ¤ËÂФ¹¤ëŬÀڤʥѥé¥á¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %d, ºÇ¾® %d, ºÇÂç %d)\n"
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "²èÁü¥µ¥¤¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "ɸ½à"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "¥í¡¼¥ë¼°µë»æ"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "¼êÆ°"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "¼êÆ°"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "¼êÆ°"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "¥È¥ì¥¤"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "¼«Æ°ÁªÂò"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¹â¤µ:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "¼Ì¿¿"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six Color Photo"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "¹õ¿§"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "¹õ¿§"
@@ -1574,138 +1605,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1791,70 +1822,70 @@ msgstr "Six Color Photo"
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "ÉõÅû"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1865,8 +1896,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2285,62 +2316,88 @@ msgstr "1200 DPI ¹âÉʼÁ"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "ÌÀ¤ë¤µ:"
@@ -2428,7 +2485,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2914,1526 +2972,3240 @@ msgid "Wide Postcard"
 msgstr "¤Ï¤¬¤­"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "¥«¥¹¥¿¥à"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89mm ¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C41ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C41ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C41ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C42ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C42ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C42ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C61"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C62"
+msgid "Epson Stylus C43"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C82"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
-msgstr "Stylus C60"
+msgid "Epson Stylus C61"
+msgstr "Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
-msgstr "Stylus C60"
+msgid "Epson Stylus C62"
+msgstr "Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5130,79 +6902,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "¥³¥Þ¥ó¥É:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "¥È¥ì¥¤£±"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "¥È¥ì¥¤£²"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "¥È¥ì¥¤£³"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "¥È¥ì¥¤£´"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "¥Æ¥¹¥È°õºþ"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Japanese"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISO ¥é¥Æ¥ó£±"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5212,9 +6984,10 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¤¤¯¤Ä¤«¤Î¾ò·ï¤Î²¼¤ÇºÆÇÛÉÛ¤ò\n"
 "´¿·Þ¤·¤Þ¤¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5245,11 +7018,12 @@ msgstr ""
 "Free Software Foundation, Inc., 56 Temple Place - \n"
 "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5287,6 +7061,8 @@ msgid ""
 "    -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 ""
 "ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n"
@@ -5331,12 +7107,13 @@ msgstr ""
 "    -m|--model         ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄê"
 "¤¹¤ë¡£\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5371,6 +7148,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "ÍÑË¡: escputil [¥ª¥×¥·¥ç¥ó] [¥³¥Þ¥ó¥É]\n"
 "ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5408,74 +7187,84 @@ msgstr ""
 "    -q ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n"
 "    -m ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄꤹ¤ë¡£\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5484,15 +7273,7 @@ msgstr ""
 "\n"
 "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5503,84 +7284,226 @@ msgstr ""
 "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+msgid "Status: Waiting\n"
+msgstr "ºÌÅÙ:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "¥¤¥ó¥¯¤Î¿§"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "»Ä¤ê¤Î³ä¹ç"
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
 "²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5656,7 +7579,7 @@ msgstr ""
 "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5722,12 +7645,17 @@ msgstr ""
 "¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5746,19 +7674,19 @@ msgstr ""
 "ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
 "ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5767,19 +7695,19 @@ msgstr ""
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5795,17 +7723,17 @@ msgstr ""
 "¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 "\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "¼ºÇԤǤ¹¡ª\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5814,27 +7742,27 @@ msgstr ""
 "¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 "ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5851,12 +7779,12 @@ msgstr ""
 "°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
 "ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5867,42 +7795,42 @@ msgstr ""
 "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
 "¤¹¡£\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "¥Ñ¥¹ #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "´Ö³ÖÊäÀµÃæ..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5915,7 +7843,7 @@ msgstr ""
 "¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
 "ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼\n"
@@ -5924,11 +7852,11 @@ msgstr "ÆþÎÏ¥¨¥é¡¼\n"
 msgid "Printing..."
 msgstr "°õºþÃæ..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/File/°õºþ..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5940,483 +7868,561 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "¤ª¤«¤·¤Ê¥«¥é¡¼¶õ´Ö: bps %d ¥Á¥ã¥ó¥Í¥ë %d ¶õ´Ö %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Äã¥ì¥Ù¥ë¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "¥Ñ¥é¥á¡¼¥¿ %s=%s (¤ª¤½¤é¤¯¿ôÃÍ) ¤ò²òÀϤǤ­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "¥×¥ê¥ó¥¿¤ò -s·¿¼° ¤ò»È¤Ã¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤ÏÉÔÌÀ¤Ê·¿¼°¤Ç¤¹\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init ¤Ë¼ºÇÔ %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥¹¥¯¥ê¥×¥¿¤ò³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "¤ª¤«¤·¤Ê¥Ñ¥é¥á¡¼¥¿; ³¹Ô¤Ç¤­¤Þ¤»¤ó¡ª\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Åù´Ö³Ö¤Î°õºþ¤ÏÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤«¡¢¤¢¤ë¤¤¤Ï\n"
-#~ "'-m' ¥ª¥×¥·¥ç¥ó¤Ç¥×¥ê¥ó¥¿¤òÆÃÄꤷ¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½ÐÃæ¤Ç¤¹..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼° %s ¤ÏÉÔÌÀ¤Ç¤¹¡£\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Gimp-Print"
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "°õºþ¤¹¤ëÌÀ¤ë¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£\n"
-#~ "(0.0Êý¸þ: °Å¤¯ 2.0Êý¸þ: ÌÀ¤ë¤¯)"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¸þ¤±¤Î°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¡ÚÃíµ­¡Û: '-l' ¤Þ¤¿¤Ï '-"
-#~ "oraw' ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£°õºþ¤Ë¼ºÇÔ¤·¤Þ¤¹¡ª"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '--%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%c%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '`%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ¤ª¤«¤·¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "ÌÀ¤ë¤µ:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "¥í¡¼¥ë¼°µë»æ"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI Unidirectional"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f / %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "°õºþ¤¹¤ë²èÁü¤Î¼ïÎफ¤é½ÐÎÏ·ë²Ì¤òºÇŬ²½¤·¤Þ¤¹¡£"
-
-#~ msgid "Solid Colors"
-#~ msgstr "̵ÃϤο§"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C41sx"
-
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C41ux"
-
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C42sx"
-
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C42ux"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n"
 
 #, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C61"
+#, fuzzy
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C61"
 
-#~ msgid "Stylus C62"
+#, fuzzy
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C62"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus C82"
+#, fuzzy
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C82"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
-#~ msgid "Stylus Photo 830"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 830"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo 915"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 915"
 
-#~ msgid "Stylus Photo 925"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 925"
 
-#~ msgid "Stylus Photo 950"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 950"
 
-#~ msgid "Stylus Photo 960"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 960"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
-#~ msgid "Stylus Photo 2100"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 2100"
 
-#~ msgid "Stylus Photo 2200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 2200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
-#~ msgid "Stylus Pro 7600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7600"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
-#~ msgid "Stylus Pro 9600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9600"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "Åù´Ö³Ö¤Î°õºþ¤ÏÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤«¡¢¤¢¤ë¤¤¤Ï\n"
+#~ "'-m' ¥ª¥×¥·¥ç¥ó¤Ç¥×¥ê¥ó¥¿¤òÆÃÄꤷ¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½ÐÃæ¤Ç¤¹..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼° %s ¤ÏÉÔÌÀ¤Ç¤¹¡£\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Gimp-Print"
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "°õºþ¤¹¤ëÌÀ¤ë¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£\n"
+#~ "(0.0Êý¸þ: °Å¤¯ 2.0Êý¸þ: ÌÀ¤ë¤¯)"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¸þ¤±¤Î°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¡ÚÃíµ­¡Û: '-l' ¤Þ¤¿¤Ï '-"
+#~ "oraw' ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£°õºþ¤Ë¼ºÇÔ¤·¤Þ¤¹¡ª"
+
+#~ msgid "PPD File?"
+#~ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '--%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%c%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '`%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ¤ª¤«¤·¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "ÌÀ¤ë¤µ:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "¥í¡¼¥ë¼°µë»æ"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 DPI Unidirectional"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f / %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "°õºþ¤¹¤ë²èÁü¤Î¼ïÎफ¤é½ÐÎÏ·ë²Ì¤òºÇŬ²½¤·¤Þ¤¹¡£"
+
+#~ msgid "Solid Colors"
+#~ msgstr "̵ÃϤο§"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C41sx"
+
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C41ux"
+
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C42sx"
+
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C42ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 192e5c6..d67af8c 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 151dc9b..09119df 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-07-01 19:36+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian/Bokmaal <no@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -74,12 +74,12 @@ msgstr ""
 msgid "Density"
 msgstr "Tetthet:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -133,207 +133,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Konvolutt"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Høyoppløsningspapir"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Overføring til T-skjorte"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Glansete fotokort"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Profesjonelt fotopapir"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -341,16 +341,16 @@ msgstr "Profesjonelt fotopapir"
 msgid "Other"
 msgstr "Annet"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Størrelse"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -367,56 +367,56 @@ msgstr "Størrelse"
 msgid "Basic Printer Setup"
 msgstr "Innstillinger for parametere"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -425,21 +425,21 @@ msgstr "Blekktype"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -449,14 +449,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Raskt heltall"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -466,164 +466,165 @@ msgstr "Raskt heltall"
 msgid "Core Parameter"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Lys magenta"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manuell med pause"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manuell uten pause"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Matt papir"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Sort"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Foto CcMmYK-farge"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY-farge"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Foto CcMmY-farge"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK-farge"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY-farge"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY-farge"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK-farge"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Sort"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -821,14 +822,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -836,14 +838,15 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -851,14 +854,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Gul"
 
@@ -866,10 +870,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -886,10 +890,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1125,233 +1129,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s er ikke en gyldig dither-algoritme\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Bildestørrelsen er ikke gyldig\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Skuff"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapir"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Høyde:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matt papir"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Sort"
@@ -1533,133 +1564,133 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanset film"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1745,70 +1776,70 @@ msgstr ""
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Glanset film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1819,8 +1850,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2233,62 +2264,88 @@ msgstr ""
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
@@ -2377,7 +2434,7 @@ msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
 #, fuzzy
-msgid "Epson 4x6 Photo Paper"
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2864,1526 +2921,3240 @@ msgid "Wide Postcard"
 msgstr "Postkort"
 
 #: src/main/xmli18n-tmp.h:131
-msgid "Custom"
-msgstr "Egendefinert"
+msgid "Chilean Office"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:132
-msgid "89 mm Roll Paper"
+msgid "Chilean Double Letter"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:133
-msgid "4 Inch Roll Paper"
+msgid "Chilean Double Office"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:134
-msgid "5 Inch Roll Paper"
-msgstr ""
+msgid "Custom"
+msgstr "Egendefinert"
 
 #: src/main/xmli18n-tmp.h:135
-msgid "210 mm Roll Paper"
+msgid "89 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:136
-msgid "13 Inch Roll Paper"
+msgid "4 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:137
-msgid "22 Inch Roll Paper"
+msgid "5 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:138
-msgid "24 Inch Roll Paper"
+msgid "210 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:139
-msgid "36 Inch Roll Paper"
+msgid "13 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:140
-msgid "44 Inch Roll Paper"
+msgid "22 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
+msgid "24 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
+msgid "36 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
+msgid "44 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 770"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 770"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Definer ny skriver"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Definer ny skriver"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Definer ny skriver"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Definer ny skriver"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Skrivernavn:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Sett opp skriver"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5044,86 +6815,86 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Innstillinger for parametere"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Utskriftstype:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Skuff 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Skuff 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Skuff 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Skuff 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testutskrift"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Norwegian"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5140,10 +6911,11 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5181,13 +6953,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5222,76 +6997,88 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan kun spesifisere én skriver eller rå enhet."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Ukjent flagg %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan ikke åpne enhet %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan ikke sende kommando til skriver\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke lese fra %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5300,15 +7087,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5319,82 +7098,224 @@ msgstr ""
 "Kan ikke finne skrivertype.\n"
 "Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
+msgid "Status: Waiting\n"
+msgstr "Metning:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Feil i inndata\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Feil i inndata\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Blekkfarge"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Skriver støtter ikke fargeutskrift\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoder...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5433,7 +7354,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5469,12 +7390,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5486,20 +7412,20 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5508,7 +7434,7 @@ msgstr ""
 "OK, skriveren er justert, men justeringen er ikke lagret.\n"
 "Hvis du ønsker å lagre justeringen må d\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5517,12 +7443,12 @@ msgstr ""
 "Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
 "skrive «r»:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5532,44 +7458,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "I ferd med å lagre innstillinger..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "feilet!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "fullført!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Innstillingene for justering er lagret til skriveren.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Siste kommando ble ikke bekreftet.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5580,12 +7506,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Trykk linjeskift for å fortsette > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5593,42 +7519,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Gjennomgang #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vennligst sett inn et nytt ark.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Tallet er utenfor gyldig område!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Kan ikke forstå det du skrev inn!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver å sette justering..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "fullført.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5637,7 +7563,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Feil i inndata\n"
@@ -5646,11 +7572,11 @@ msgstr "Feil i inndata\n"
 msgid "Printing..."
 msgstr "Skriver ut..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Fil/Skriv ut..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5662,467 +7588,533 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Ugyldige parametere; kan ikke fortsette!\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Ingen rad for buffer\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Ugyldige parametere; kan ikke fortsette!\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Skriver %s er ikke en kjent modell\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Henting av neste rad feilet ved %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "Henting av neste rad feilet ved %.0f\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init feilet %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Kan ikke åpne fildeskriptor: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Kan ikke åpne %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Ugyldige parametere; kan ikke fortsette!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan ikke tolke utskrift fra skriver\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Gul"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Skriverstatus krever bruk av en rå enhet.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Gul"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Prøver å finne identifisere skrivermodell..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Skrivermodell %s er ukjent.\n"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Om Gimp-Print"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD/Fil?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: flagget `%s' er flertydig\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: flagget `--%s' tillater ikke argumenter\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: flagget `%c%s' tillater ikke argumenter\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: flagget `%s' krever et argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: ukjent flagg `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: ukjent flagg `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ulovlig flagg -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ugyldig flagg -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: flagget krever et argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: flagget `-W %s' er flertydig\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: flagget `-W %s' tillater ikke argumenter\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Lysstyrke:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Skaler utskriften til størrelsen på papiret"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "Metning:"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f av %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 770"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Skriver støtter ikke fargeutskrift\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan ikke tolke utskrift fra skriver\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Gul"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Skriverstatus krever bruk av en rå enhet.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Gul"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Prøver å finne identifisere skrivermodell..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "Skrivermodell %s er ukjent.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Om Gimp-Print"
+
+#~ msgid "PPD File?"
+#~ msgstr "PPD/Fil?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: flagget `%s' er flertydig\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flagget `--%s' tillater ikke argumenter\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: flagget `%c%s' tillater ikke argumenter\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: flagget `%s' krever et argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: ukjent flagg `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: ukjent flagg `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovlig flagg -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ugyldig flagg -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: flagget krever et argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: flagget `-W %s' er flertydig\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: flagget `-W %s' tillater ikke argumenter\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Lysstyrke:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Skaler utskriften til størrelsen på papiret"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "Metning:"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f av %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
 #~ msgid "Printer %s does not require color head alignment.\n"
 #~ msgstr "Skriver %s krever ikke justering av fargehode.\n"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 1cbd16d..7c64191 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 5e0faad..e0e4299 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gimp-print 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-03-15 20:31+0100\n"
 "Last-Translator: Hylke Witjens <hylke@wwd.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr ""
 
@@ -77,12 +77,12 @@ msgstr ""
 msgid "Density"
 msgstr "Densiteit:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -138,207 +138,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparanten"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Envelop"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Hoog-resolutie papier"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt doordrukken"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Hoogglans papier"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Glanzend fotopapier"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Glanzende fotokaarten"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Professioneel fotopapier"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -346,16 +346,16 @@ msgstr "Professioneel fotopapier"
 msgid "Other"
 msgstr "Overige"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Grootte"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -372,56 +372,56 @@ msgstr "Grootte"
 msgid "Basic Printer Setup"
 msgstr "Printerinstellingen"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Grootte van het papaier waarop je wenst te printen"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Medium Bron"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Inkt type"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -430,21 +430,21 @@ msgstr "Inkt type"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -454,14 +454,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Printer model:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -471,168 +471,169 @@ msgstr "Printer model:"
 msgid "Core Parameter"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Licht Magenta"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Automatische papierlader"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Handmatig met pauze"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Handmatig zonder pauze"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Mat papier"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Zwart"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Foto CcMmYK Kleuren"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY kleuren"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Foto CcMmY kleuren"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK Kleuren"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY kleuren"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY kleuren"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK Kleuren"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Zwart"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -829,14 +830,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -845,14 +847,15 @@ msgstr "Cyaan"
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -861,14 +864,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Geel"
 
@@ -877,10 +881,10 @@ msgstr "Geel"
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -899,10 +903,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1141,233 +1145,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s is geen juiste parameter van type %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Onbekende printer %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Afbeelding grootte is niet juist\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Bovenmarge mag niet minder dan nul zijn\n"
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Linkermarge mag niet minder dan nul zijn\n"
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Linkermarge mag niet minder dan nul zijn\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Bovenmarge mag niet minder dan nul zijn\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Handmatig"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Handmatig"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Handmatig"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Lade"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapier"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch Selecteren"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Hoogte: "
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Licht Magenta"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Zwart"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Geel"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mat papier"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapier"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanzende laag"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Zwart"
@@ -1554,137 +1585,137 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Densiteit:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densiteit:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanzende laag"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Handmatig"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Grootte"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printer ondersteund geen kleuren\n"
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1770,70 +1801,70 @@ msgstr "Zes kleuren foto"
 msgid "Five Color Photo Composite"
 msgstr "Vijf kleuren foto composiet"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1844,8 +1875,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2266,62 +2297,88 @@ msgstr "1440 x 360 DPI Hoogste kwaliteit"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Hoogste kwaliteit"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Hoogste kwaliteit"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Hoogste kwaliteit"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Hoogste kwaliteit"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helderheid:"
@@ -2409,7 +2466,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Fotopapier"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2896,1526 +2954,3240 @@ msgid "Wide Postcard"
 msgstr "Briefkaart"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Eigen"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Stel nieuwe Printer in"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Stel nieuwe Printer in"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Stel nieuwe Printer in"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Stel nieuwe Printer in"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Printer Naam:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Stel Printer in"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5099,78 +6871,78 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Printerinstellingen"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Opdracht:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Lade 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Lade 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Lade 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Lade 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Test afdruk"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Dutch"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil versie"
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5181,9 +6953,10 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' in voor details.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5215,10 +6988,11 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5256,13 +7030,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5297,76 +7074,88 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, 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:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "U mag maar een printermodel specificeren"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Onbekende optie %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan apparaat %s:%s niet openen\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan de opdracht niet versturen naar de printer\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan niet lezen van %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan %s niet openen lezen/schrijven: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan niet schrijven naar %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5375,15 +7164,7 @@ msgstr ""
 "\n"
 "Kan niet schrijven naar %s:%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5394,84 +7175,226 @@ msgstr ""
 "Kan printer type niet vaststellen.\n"
 "Gebruik asjeblief -m om je printermodel te specificeren.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Printer status heeft een raw device nodig.\n"
+msgid "Status: Waiting\n"
+msgstr "Gekleurdheid:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1064
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Kleureninkt"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Overblijvend percentage"
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Printer ondersteund geen kleuren\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Printer status heeft een raw device nodig.\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Printer status heeft een raw device nodig.\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "U mag maar een printermodel specificeren"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Bezig met het schoonmaken van de koppen..\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Bezig met nozzle check, let er astublief op, dat er papier in de printer "
 "zit.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5549,7 +7472,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5627,12 +7550,17 @@ msgstr ""
 "tijdens deze procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Niet mogelijk om commando's naar de printer te sturen, eindigd.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5644,19 +7572,19 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5665,19 +7593,19 @@ msgstr ""
 "OK, je printer is uitgelijnt, maar de uitlijnen is niet bewaard.\n"
 "Als je de uitlijning wilt bewaren, moet je het proces herhalen.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Herhaal de uitlijn procedure.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5687,17 +7615,17 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Bezig met schrijven van instellingen..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "Gefaalt!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5706,27 +7634,27 @@ msgstr ""
 "Je instellingen werden niet succesvol weggeschreven. Je moet de\n"
 "uitlijn procedure herhalen.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "Gelukt!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, fuzzy, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Je uitlijn instellingen zijn bewaard door de printer.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Onbekend commando.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Laatste commando is niet bevestigd.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5737,12 +7665,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Druk enter om door te gaan >"
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5753,42 +7681,42 @@ msgstr ""
 "patroon.\n"
 "Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Voer astublief een nieuw vel papier in.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nummer valt buiten bereik!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Probeert uitlijning in te stellen."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "gelukt.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5801,7 +7729,7 @@ msgstr ""
 "lijn patroon %d is. Als het dat niet is, zul je de procedure moeten\n"
 "herhalen om de beste kwaliteit te krijgen.\n"
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5810,11 +7738,11 @@ msgstr ""
 msgid "Printing..."
 msgstr "Bezig met afdrukken..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5826,481 +7754,547 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Zoek volgende rij faalde op %d\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Lukt niet om %s:%s te openen\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Printer moet gespecificeerd worden met -sMODEL\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Printer %s is geen bekend model\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Onbekende printer %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Zoek volgende rij faalde op %d\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "Zoek volgende rij faalde op %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init faalde %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Lukt niet om %s:%s te openen\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Lukt niet om %s:%s te openen\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Onbekende printer %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zoek volgende rij faalde op %d\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan de uitvoer van de printer niet verwerken\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Pas de hoeveelheid geel aan"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "Zoek volgende rij faalde op %d\n"
 
 #, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Pas de hoeveelheid geel aan"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Printer uitlijnen moet gedaan worden met een raw device of ander\n"
-#~ "moet de optie -m gebruikt worden om een printer te specificeren.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Probeer printer model te detecteren..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "kan %s niet openen voor lees/schrijf actie : %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Printer model %s is niet bekend.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Info over Gimp-Print"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Geef het juist commando in om naar jouw printer af te drukken. Let op: "
-#~ "Verwijder alsjeblieft de `-l` of `-oraw` van de commando-string, of het "
-#~ "printen zal waarschijnlijk falen!"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD Bestand?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: optie `%s' is ambiguous\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `--%s' verwacht geen argument\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `%c%s' verwacht geen argument\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: optie `%s' verwacht een argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: onbekende optie `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: onbekende optie `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: optie verwacht een argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `-W %s' staat geen argument toe\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Helderheid:"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Rolinvoer"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI unidirectioneel"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f van %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
 #, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Printer ondersteund geen kleuren\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan de uitvoer van de printer niet verwerken\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Pas de hoeveelheid geel aan"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Pas de hoeveelheid geel aan"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "Printer uitlijnen moet gedaan worden met een raw device of ander\n"
+#~ "moet de optie -m gebruikt worden om een printer te specificeren.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Probeer printer model te detecteren..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "kan %s niet openen voor lees/schrijf actie : %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "Printer model %s is niet bekend.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Info over Gimp-Print"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Geef het juist commando in om naar jouw printer af te drukken. Let op: "
+#~ "Verwijder alsjeblieft de `-l` of `-oraw` van de commando-string, of het "
+#~ "printen zal waarschijnlijk falen!"
+
+#~ msgid "PPD File?"
+#~ msgstr "PPD Bestand?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: optie `%s' is ambiguous\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: optie `--%s' verwacht geen argument\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: optie `%c%s' verwacht geen argument\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: optie `%s' verwacht een argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: onbekende optie `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: onbekende optie `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: optie verwacht een argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: optie `-W %s' staat geen argument toe\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Helderheid:"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Rolinvoer"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 DPI unidirectioneel"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f van %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 71db317..e39eacf 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index e7797db..93a295f 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2001-10-18 11:53+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domy¶lne"
@@ -81,12 +81,12 @@ msgstr ""
 msgid "Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -140,207 +140,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "1440 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "1440 x 360 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Przezroczyste"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Koperta"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr ""
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr ""
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -348,16 +348,16 @@ msgstr ""
 msgid "Other"
 msgstr "Inne"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -374,55 +374,55 @@ msgstr "Rozmiar"
 msgid "Basic Printer Setup"
 msgstr "Ustawienia drukarki"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -431,21 +431,21 @@ msgstr ""
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -455,14 +455,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model drukarki:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -472,160 +472,161 @@ msgstr "Model drukarki:"
 msgid "Core Parameter"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 msgid "Cassette"
 msgstr ""
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Czarny"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr ""
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
 msgstr ""
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
 msgstr ""
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr ""
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Czarny"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
@@ -822,14 +823,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -837,14 +839,15 @@ msgstr "Niebieskozielony"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -852,14 +855,15 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "¯ó³æ"
 
@@ -867,10 +871,10 @@ msgstr "¯ó³æ"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -887,10 +891,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1126,226 +1130,251 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Typ wyj¶ciowy:"
+
+#: src/main/print-escp2-data.c:553
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Czarny"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Wysoko¶æ:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Czarny"
@@ -1525,129 +1554,129 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 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:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1733,70 +1762,70 @@ msgstr ""
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1807,8 +1836,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2214,62 +2243,88 @@ msgstr ""
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jasno¶æ:"
@@ -2356,7 +2411,7 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:11
@@ -2842,1527 +2897,3237 @@ msgid "Wide Postcard"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:131
-#, fuzzy
-msgid "Custom"
-msgstr "Automatycznie"
+msgid "Chilean Office"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:132
-msgid "89 mm Roll Paper"
+msgid "Chilean Double Letter"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:133
-msgid "4 Inch Roll Paper"
+msgid "Chilean Double Office"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:134
-msgid "5 Inch Roll Paper"
-msgstr ""
+#, fuzzy
+msgid "Custom"
+msgstr "Automatycznie"
 
 #: src/main/xmli18n-tmp.h:135
-msgid "210 mm Roll Paper"
+msgid "89 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:136
-msgid "13 Inch Roll Paper"
+msgid "4 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:137
-msgid "22 Inch Roll Paper"
+msgid "5 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:138
-msgid "24 Inch Roll Paper"
+msgid "210 mm Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:139
-msgid "36 Inch Roll Paper"
+msgid "13 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:140
-msgid "44 Inch Roll Paper"
+msgid "22 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
+msgid "24 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
+msgid "36 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
+msgid "44 Inch Roll Paper"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+msgid "Generic PCL 4 Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:490
+msgid "Generic PCL 5 Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:491
+msgid "Generic PCL 5c Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:492
+msgid "Generic PCL 5e Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Model drukarki:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Ustawienia drukarki"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5013,82 +6778,82 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Polecenie:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Wydrukuj"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Polish"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5105,10 +6870,11 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5146,13 +6912,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5187,76 +6956,88 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Mo¿na podaæ tylko jedn± drukarkê lub surowe urz±dzenie."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Mo¿na podaæ tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nie mo¿na wys³aæ polecenia do drukarki\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5265,15 +7046,7 @@ msgstr ""
 "\n"
 "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5281,82 +7054,224 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, 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"
+msgid "Status: Waiting\n"
+msgstr "Nasycenie:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1064
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
+#, 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:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Czyszczenie g³owic...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5395,7 +7310,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5431,12 +7346,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5448,38 +7368,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5489,44 +7409,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5537,12 +7457,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5550,42 +7470,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5594,7 +7514,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5603,11 +7523,11 @@ msgstr ""
 msgid "Printing..."
 msgstr "Drukowanie..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Plik/Wydrukuj..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5619,444 +7539,502 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr ""
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "¯ó³æ"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "¯ó³æ"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Wydrukuj"
-
-#~ msgid "PPD File?"
-#~ msgstr "Plik PPD?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: opcja \"%s\" jest niejednoznaczna\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"--%s\" nie pozwala na u¿ycie argumentu\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"%c%s\" nie pozwala na u¿ycie argumentu\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: opcja \"%s\" wymaga argumentu\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: nierozpoznana opcja \"--%s\"\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: nierozpoznana opcja \"%c%s\"\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: niepoprawna opcja -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: niepoprawna opcja -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: opcja wymaga argumentu -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: opcja \"-W %s\" jest niejednoznaczna\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"-W %s\" nie pozwala na u¿ycie argumentu\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Jasno¶æ:"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "Nasycenie:"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Jednolite p³aszczyzny"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "¯ó³æ"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "¯ó³æ"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Wydrukuj"
+
+#~ msgid "PPD File?"
+#~ msgstr "Plik PPD?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: opcja \"%s\" jest niejednoznaczna\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja \"--%s\" nie pozwala na u¿ycie argumentu\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja \"%c%s\" nie pozwala na u¿ycie argumentu\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: opcja \"%s\" wymaga argumentu\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: nierozpoznana opcja \"--%s\"\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: nierozpoznana opcja \"%c%s\"\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: niepoprawna opcja -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: niepoprawna opcja -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: opcja wymaga argumentu -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: opcja \"-W %s\" jest niejednoznaczna\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opcja \"-W %s\" nie pozwala na u¿ycie argumentu\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Jasno¶æ:"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "Nasycenie:"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Jednolite p³aszczyzny"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
 #~ msgid "Right Border:"
 #~ msgstr "Prawa krawêd¼:"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index acd518e..afb2391 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index a686b8c..9566733 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
-"PO-Revision-Date: 2002-10-16 19:24+0100\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"PO-Revision-Date: 2006-05-04 07:20-0400\n"
 "Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -77,12 +77,12 @@ msgstr ""
 msgid "Density"
 msgstr "Densidade:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -147,207 +147,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Papel Normal"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Papel Normal"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Transparências"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Filme de impressão por trás"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Folhas de Fábrica"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Envelope"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Papel de Alta Resolução"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Transferências para T-Shirt"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Filme Muito Lustroso"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Cartões de Fotografia Lustrosos"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Papel de Fotografia Profissional"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -355,16 +355,16 @@ msgstr "Papel de Fotografia Profissional"
 msgid "Other"
 msgstr "Outro"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamanho"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -381,57 +381,57 @@ msgstr "Tamanho"
 msgid "Basic Printer Setup"
 msgstr "Definições da Impressora"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamanho do papel para o qual deseja imprimir"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Tipo de Média"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Fonte de Média"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Fonte do \"media\" para o qual está a imprimir"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -440,21 +440,21 @@ msgstr "Tipo de tinta"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,14 +464,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -481,168 +481,169 @@ msgstr "Modelo da Impressora:"
 msgid "Core Parameter"
 msgstr "Papel ColorLife"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Alimentador de Folhas Automático"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manual com Pausa"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manual sem Pausa"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Papel Mate"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Preto"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Cor CcMmYK de Fotografia<"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "Cor CMY"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Cor CcMmY de Fotografia"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "Cor CMYK"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Cor CcMmY de Fotografia"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "Cor CMY"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Cor CcMmYK de Fotografia<"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Preto"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -845,14 +846,15 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -861,14 +863,15 @@ 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/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -877,14 +880,15 @@ 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/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -893,10 +897,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/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -915,10 +919,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/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1162,233 +1166,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, 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:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Tamanho da imagem não é válido\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, 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:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manual"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manual"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Tabuleiro"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel de Fotografia"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Mate"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Preto"
@@ -1576,138 +1607,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 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:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1793,70 +1824,70 @@ msgstr "Seis Cores Foto"
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1867,8 +1898,8 @@ msgstr "Papel Pesado Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2287,62 +2318,88 @@ msgstr "1440 x 360 DPI Máxima Qualidade"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
@@ -2430,7 +2487,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2916,1526 +2974,3240 @@ msgid "Wide Postcard"
 msgstr "Cartão"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "Papel Contínuo 89 mm"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "Papel Contínuo 5 Polegadas"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "Papel Contínuo 210 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "Papel Contínuo 22 Polegadas"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "Papel Contínuo 24 Polegadas"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "Papel Contínuo 44 Polegadas"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C41ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C41ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C41ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C42ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C42ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C42ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C61"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C62"
+msgid "Epson Stylus C43"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C82"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
-msgstr "Stylus C60"
+msgid "Epson Stylus C61"
+msgstr "Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
-msgstr "Stylus C60"
+msgid "Epson Stylus C62"
+msgstr "Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus c20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Definir nova Impressora"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Definir nova Impressora"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Definir nova Impressora"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Definir nova Impressora"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Nome da Impressora:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Configurar a Impressora"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5145,79 +6917,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Definições da Impressora"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de Output:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Tabuleiro 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Tabuleiro 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Tabuleiro 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Tabuleiro 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "impressão de teste"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Portuguese"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Versão de Escputil"
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5227,9 +6999,10 @@ msgstr ""
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5261,11 +7034,12 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5303,6 +7077,8 @@ msgid ""
 "    -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 ""
 "Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                    [-P printer | -r device] [-u] [-q] [-m model]\n"
@@ -5343,12 +7119,13 @@ msgstr ""
 "    -m|--model         Specify the precise printer model for head "
 "alignment.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5383,6 +7160,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Utilização: escputil [OPTIONS] [COMMAND]\n"
 "Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5420,74 +7199,84 @@ msgstr ""
 "    -q Suppress the banner.\n"
 "    -m Specify the precise printer model for head alignment.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Você só pode especificar uma impresoora ou dispositivo"
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Opção desconhecida %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Não foi possível abrir o dispositivo %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Não foi possível enviar comando para a impressora\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Não é possível ler a partir de %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, 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:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5496,15 +7285,7 @@ msgstr ""
 "\n"
 "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5515,83 +7296,225 @@ 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:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
 #, 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"
+msgid "Status: Waiting\n"
+msgstr "Saturação:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Erro no input\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Erro no input\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Cor da Tinta"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "A impressora não suporta a cor de impressão\n"
+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:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpando as cabeças...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "A testar a agulha, por favor assegure-se que existe papel na impressora.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5676,7 +7599,7 @@ msgstr ""
 "procedimento.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5751,12 +7674,17 @@ msgstr ""
 "os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5775,20 +7703,20 @@ msgstr ""
 "Vai-lhe ser pedido para confirmar a sua escolha.\n"
 "O que é que pretende fazer (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5797,7 +7725,7 @@ msgstr ""
 "A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
 "Se deseja gravar o alinhamento, terá de repetir o processo.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5806,12 +7734,12 @@ msgstr ""
 "Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
 "o processo de alinhamento:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5826,17 +7754,17 @@ msgstr ""
 "Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
 "as configurações para a sua impressora:\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Prestes a gravar as configurações..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "falhou!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5845,28 +7773,28 @@ msgstr ""
 "A suas configurações não foram gravados com sucesso.\n"
 "Vai ter de repetir o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "sucesso!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 "As suas configurações do alinhamento foram gravadas para a impressora.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando desconhecido.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "O comando final não foi confirmado.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5883,12 +7811,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:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Pressione enter para continuar > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5899,42 +7827,42 @@ msgstr ""
 "padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Passagem #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, 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:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Número fora do intervalo|\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Eu não consigo intender o que escreveu!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentando definir o alinhamento..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "sucesso.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5949,7 +7877,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Erro no input\n"
@@ -5958,11 +7886,11 @@ msgstr "Erro no input\n"
 msgid "Printing..."
 msgstr "Imprimindo..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
-msgstr "<Imagem>/Ficheiro/Imprimir..."
+msgstr "<Image>/Ficheiro/Imprimir..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5974,486 +7902,564 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Espaço de cor inválido: bps %d channels %d space %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Sem buffer de linha\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Não foi possível procesar parâmetro %s=%s (número esperado)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Impressora deve ser especificada com -sModelo\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Impressora %s não é um modelo conhecido\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header falhou %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init falhou %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Não foi possível abrir \"file descriptor\": %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Parâmetros inválidos; não é possível continuar|\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Não é possivel processar o output da impressora\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Status da impressora requere a utilização de um dipositivo.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "O alinhamento da impressora deve ser feiro com um dipositovo\n"
-#~ "ou então a opção -m deve ser usada para especificar a impressora.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Tentado detectar o modelo da impressora..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Não foi possível abir %s leitura/escrita %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "O modelo de impressora %s é desconhecido.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Acerca do Gimp-Print "
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header falhou %d\n"
 
 #, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Defina o brilho da impressão.\n"
-#~ "0 é preto sólido, 2 é branco sólido"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Insira o comando correcto para imprimir para a sua impressora. Nota: Por "
-#~ "favor\n"
-#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão "
-#~ "provavelmente \n"
-#~ "vai falhar!"
-
-#~ msgid "PPD File?"
-#~ msgstr "Ficheiro PPD?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: a opção `%s' é ambígua\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "'%s': a opção `--%s' não admite um argumento\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: a opção `%c%s' não admite um argumento\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: a opção `%s' requere um argumento\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opção não reconhecida `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opcção não reconhecida `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opção inválida -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: opção requere um argumento -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: opção `-W %s' é ambígua\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opção `-W %s' não permite um argumento\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Brilho:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Redimensionar a impressão para o tamanho da página"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Rolo de Alimentação"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI Unidireccional"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f de %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimizar o output para o tipo de imagem a ser imprimida"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Cores Sólidas"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus c20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C41sx"
-
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C41ux"
-
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C42sx"
-
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C42ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C61"
+#, fuzzy
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C61"
 
-#~ msgid "Stylus C62"
+#, fuzzy
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C62"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus C82"
+#, fuzzy
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C82"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
-#~ msgid "Stylus Photo 830"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 830"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo 915"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 915"
 
-#~ msgid "Stylus Photo 925"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 925"
 
-#~ msgid "Stylus Photo 950"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 950"
 
-#~ msgid "Stylus Photo 960"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 960"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
-#~ msgid "Stylus Photo 2100"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 2100"
 
-#~ msgid "Stylus Photo 2200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 2200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
-#~ msgid "Stylus Pro 7600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7600"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
-#~ msgid "Stylus Pro 9600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9600"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "A impressora não suporta a cor de impressão\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Não é possivel processar o output da impressora\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Status da impressora requere a utilização de um dipositivo.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "O alinhamento da impressora deve ser feiro com um dipositovo\n"
+#~ "ou então a opção -m deve ser usada para especificar a impressora.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Tentado detectar o modelo da impressora..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Não foi possível abir %s leitura/escrita %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "O modelo de impressora %s é desconhecido.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Acerca do Gimp-Print "
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "Defina o brilho da impressão.\n"
+#~ "0 é preto sólido, 2 é branco sólido"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Insira o comando correcto para imprimir para a sua impressora. Nota: Por "
+#~ "favor\n"
+#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão "
+#~ "provavelmente \n"
+#~ "vai falhar!"
+
+#~ msgid "PPD File?"
+#~ msgstr "Ficheiro PPD?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: a opção `%s' é ambígua\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "'%s': a opção `--%s' não admite um argumento\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: a opção `%c%s' não admite um argumento\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: a opção `%s' requere um argumento\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: opção não reconhecida `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: opcção não reconhecida `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: opção inválida -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: opção requere um argumento -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: opção `-W %s' é ambígua\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opção `-W %s' não permite um argumento\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Brilho:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Redimensionar a impressão para o tamanho da página"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Rolo de Alimentação"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 DPI Unidireccional"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f de %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "Optimizar o output para o tipo de imagem a ser imprimida"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Cores Sólidas"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus c20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C41sx"
+
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C41ux"
+
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C42sx"
+
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C42ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/sk.gmo b/po/sk.gmo
index 8e1bd40..361faa5 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index f350164..2daddd7 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: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Nastavi» ¹tandardné"
@@ -80,12 +80,12 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -150,207 +150,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Priesvitná fólia"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Normálny papier"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Obálka"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Papier s vysokým rozlí¹ením"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "Na¾ehµovacia fólia"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Vysokolesklý film"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Lesklý foto papier"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Lesklé foto karty"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Foto papier pro"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -358,16 +358,16 @@ msgstr "Foto papier pro"
 msgid "Other"
 msgstr "Iné"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Veµkos»"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -384,57 +384,57 @@ msgstr "Veµkos»"
 msgid "Basic Printer Setup"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -443,21 +443,21 @@ msgstr "Typ atramentu"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ atramentu tlaèiarne"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -467,14 +467,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tlaèiarne:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -484,168 +484,169 @@ msgstr "Model tlaèiarne:"
 msgid "Core Parameter"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Automatický podávaè papiera"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manuálne s preru¹ením"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manuálne bez preru¹enia"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Matný papier"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Èierna"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "Fotografická CcMmYK farba"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY farba"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "Fotografická CcMmY farba"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK farba"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "Fotografická CcMmY farba"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY farba"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "Fotografická CcMmYK farba"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Èierna"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -847,14 +848,15 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -863,14 +865,15 @@ 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/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -879,14 +882,15 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "®ltá"
 
@@ -895,10 +899,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/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -917,10 +921,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1164,233 +1168,260 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, 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:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznáma tlaèiareò %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Veµkos» obrázka nie je platná\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horný okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "©tandardný"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Kotúèový podávaè"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuál"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuál"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuál"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Zásobník"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotografický papier"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Vý¹ka:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "®ltá"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papier"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Èierna"
@@ -1578,138 +1609,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 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:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1795,70 +1826,70 @@ msgstr "Fotografický ¹es»farebný"
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Lesklý film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Papier pre atramentovú tlaèiareò"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1869,8 +1900,8 @@ msgstr "Ilford »a¾ký papier"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2291,62 +2322,88 @@ msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -2434,7 +2491,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2921,1526 +2979,3240 @@ msgid "Wide Postcard"
 msgstr "Pohµadnica"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Vlastný"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
+msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
+msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
+msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
+msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
+msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Definovanie novej tlaèiarne"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Definovanie novej tlaèiarne"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Definovanie novej tlaèiarne"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Definovanie novej tlaèiarne"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Názov tlaèiarne:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Nastavi» tlaèiareò"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5146,79 +6918,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ výstupu:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Príkaz:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Zásobník 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Zásobník 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Zásobník 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Zásobník 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Test tlaèe"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Slovak"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Verzia Escputil "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5229,9 +7001,10 @@ msgstr ""
 "Toto je slobodný softvér a jeho redistribúcia je za istých podmienok\n"
 "vítaná; viac informácií získate po napísaní 'escputil -l'.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5267,11 +7040,12 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5309,6 +7083,8 @@ msgid ""
 "    -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 ""
 "Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
@@ -5357,12 +7133,13 @@ msgstr ""
 "    -m|--model         Urèenie presného modelu tlaèiarne pre zarovnanie "
 "hlavy.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5397,6 +7174,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Pou¾itie: escputil [VO¥BA] [PRÍKAZ]\n"
 "Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5435,74 +7214,84 @@ msgstr ""
 "    -q zakázanie nápisu.\n"
 "    -m Urèenie presného modelu tlaèiarne pre zarovnanie hlavy.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Mô¾ete ¹pecifikova» len jednu tlaèiareò alebo prvotné zariadenie."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Neznáme nastavenie %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nie je mo¾né otvori» zariadenie %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nie je mo¾né posla» príkaz na tlaèiareò\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie je mo¾né èíta» z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, 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:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5511,15 +7300,7 @@ msgstr ""
 "\n"
 "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5530,82 +7311,224 @@ 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:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, 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"
+msgid "Status: Waiting\n"
+msgstr "Sýtos»:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Farebný atrament"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Tlaèiareò nepodporuje farebný výstup\n"
+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:1144
+#: src/escputil/escputil.c:1451
 #, 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:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: 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:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Èistenie hláv...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5680,7 +7603,7 @@ msgstr ""
 "toho procesu nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5750,12 +7673,17 @@ msgstr ""
 "nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5774,20 +7702,20 @@ msgstr ""
 "Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
 "Èo chcete spravi»? (s,q,r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5796,7 +7724,7 @@ msgstr ""
 "V poriadku, va¹a tlaèiareò je  zarovnaná, ale zarovnanie nebolo ulo¾ené.\n"
 "Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5805,12 +7733,12 @@ msgstr ""
 "Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
 "zarovnávania:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5825,17 +7753,17 @@ msgstr ""
 "Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
 "va¹ej tlaèiarne:\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "O nastaveniach ukladania..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "zlyhalo!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5844,27 +7772,27 @@ msgstr ""
 "Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
 "procedúru zarovnávania.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "úspe¹ne!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Neznámy príkaz.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Závereèný príkaz nebol potvrdený.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5881,12 +7809,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:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Pre pokraèovanie stlaète enter > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5896,42 +7824,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:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Prechod #%d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, 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:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èíslo je mimo rozsahu!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokú¹am sa nastavi» zarovnávanie..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "úspe¹né.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5944,7 +7872,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba na vstupe\n"
@@ -5953,11 +7881,11 @@ msgstr "Chyba na vstupe\n"
 msgid "Printing..."
 msgstr "Tlaèím..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Súbor/Tlaè..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5969,500 +7897,566 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Zlý farebný priestor: bps %d kanály %d priestor %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Neexistuje riadkový bufer\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Nie je mo¾né analyzova» parameter %s=%s (oèakáva sa èíslo)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Tlaèiareò musí by» urèené pomocou -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Tlaèiareò %s nie je známy model\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Neznáma tlaèiareò %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init zlyhalo %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Nepodarilo sa otvori» popis súboru: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Nie je mo¾né otvori» %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Neznáma tlaèiareò %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Zlé parametre; nie je mo¾né pokraèova»!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Zarovnanie tlaèiarne musí by» vykonané so základného zariadením alebo\n"
-#~ "pomocou voµby -m musíte urèi» tlaèiareò.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Pokú¹am sa zisti» model tlaèiarne..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Neznámy typ tlaèiarne %s.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "O Gimp-Print "
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Nastavenie jasu tlaèe.\n"
-#~ "0 je jednoliatu èiernu, 2 pre jednoliatu bielu"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Vlo¾te správny príkaz pre tlaè na va¹ej tlaèiarni. Poznámka: Neodstráòte "
-#~ "prosím z re»azca pre tlaè prepínaèe `-l' alebo `-oraw', lebo tlaè "
-#~ "pravdepodobne nebude úspe¹ná!"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD súbor?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: voµba `%s' je viacznaèná\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `--%s' nedovoµuje pou¾i» argument\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `%c%s' nedovoµuje pou¾i» argument\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: voµba `%s' vy¾aduje argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: neznáma voµba `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: neznáma voµba `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: neplatná voµba -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neplatná voµba -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: voµba vy¾aduje argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: voµba `-W %s` je viacznaèná\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `-W %s' nedovoµuje pou¾i» argument\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Jas:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Kotúèový podávaè"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI Jednosmerne"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f z %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimalizova» výstup podµa typu tlaèeného obrázku"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Jednoliate farby"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C61"
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "Stylus C62"
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
 #, fuzzy
-#~ msgid "Stylus C82"
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
 #, fuzzy
-#~ msgid "Stylus Photo 830"
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
 #, fuzzy
-#~ msgid "Stylus Photo 915"
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 925"
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 950"
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 750"
 
 #, fuzzy
-#~ msgid "Stylus Photo 960"
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2100"
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 1200"
 
 #, fuzzy
-#~ msgid "Stylus Photo 2200"
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 7600"
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
 #, fuzzy
-#~ msgid "Stylus Pro 9600"
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Tlaèiareò nepodporuje farebný výstup\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "Zarovnanie tlaèiarne musí by» vykonané so základného zariadením alebo\n"
+#~ "pomocou voµby -m musíte urèi» tlaèiareò.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Pokú¹am sa zisti» model tlaèiarne..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "Neznámy typ tlaèiarne %s.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "O Gimp-Print "
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "Nastavenie jasu tlaèe.\n"
+#~ "0 je jednoliatu èiernu, 2 pre jednoliatu bielu"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Vlo¾te správny príkaz pre tlaè na va¹ej tlaèiarni. Poznámka: Neodstráòte "
+#~ "prosím z re»azca pre tlaè prepínaèe `-l' alebo `-oraw', lebo tlaè "
+#~ "pravdepodobne nebude úspe¹ná!"
+
+#~ msgid "PPD File?"
+#~ msgstr "PPD súbor?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: voµba `%s' je viacznaèná\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: voµba `--%s' nedovoµuje pou¾i» argument\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: voµba `%c%s' nedovoµuje pou¾i» argument\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: voµba `%s' vy¾aduje argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: neznáma voµba `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: neznáma voµba `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neplatná voµba -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: neplatná voµba -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: voµba vy¾aduje argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: voµba `-W %s` je viacznaèná\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: voµba `-W %s' nedovoµuje pou¾i» argument\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Jas:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Kotúèový podávaè"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 DPI Jednosmerne"
+
+#~ msgid "24x36"
+#~ msgstr "24x36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f z %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "Optimalizova» výstup podµa typu tlaèeného obrázku"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Jednoliate farby"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C40ux"
+
+#, fuzzy
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C40sx"
+
+#, fuzzy
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C40ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index faaa933..b11ca35 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 8acb8f0..2218f61 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002.
 #
-# $Id: sv.po,v 1.75 2005/09/02 02:15:19 rlk Exp $
+# $Id: sv.po,v 1.79 2006/05/06 01:34:54 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2002-10-03 13:47+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 #, fuzzy
 msgid "Default"
 msgstr "Ställ in standardvärden"
@@ -79,12 +79,12 @@ msgstr ""
 msgid "Density"
 msgstr "Intensitet:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -149,207 +149,207 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 × 360 DPI MW2"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 × 720 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "Vanligt papper"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Vanligt papper"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "Genomskinligheter"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr "Bakutskriftsfilm"
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr "Tygark"
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "Kuvert"
 
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "Högupplösningspapper"
 
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T-shirttryck"
 
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "Högglansig film"
 
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "Glansigt fotopapper"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr "Glansiga fotokort"
 
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "Professionellt fotopapper"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -357,16 +357,16 @@ msgstr "Professionellt fotopapper"
 msgid "Other"
 msgstr "Annat"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Storlek"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -383,57 +383,57 @@ msgstr "Storlek"
 msgid "Basic Printer Setup"
 msgstr "Skrivarinställningar"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Storlek på pappret som du vill skriva ut till"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -442,21 +442,21 @@ msgstr "Bläcktyp"
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 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:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -466,14 +466,14 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Skrivarmodell:"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -483,168 +483,169 @@ msgstr "Skrivarmodell:"
 msgid "Core Parameter"
 msgstr "ColorLife-papper"
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Ljus magenta"
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "Automatisk arkmatare"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr "Manuell med paus"
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr "Manuell utan paus"
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 #, fuzzy
 msgid "Cassette"
 msgstr "Matte-papper"
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "Svart"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr "CcMmYK-fotofärg"
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY-färg"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr "CcMmY-fotofärg"
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK-färg"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr "CcMmY-fotofärg"
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY-färg"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr "CcMmYK-fotofärg"
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "Svart"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -847,14 +848,15 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -863,14 +865,15 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -879,14 +882,15 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "Gult"
 
@@ -895,10 +899,10 @@ msgstr "Gult"
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr ""
 
@@ -917,10 +921,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr ""
 
@@ -1164,234 +1168,261 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s är inte en giltig %s\n"
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Okänd skrivare %s\n"
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, 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:711
+#: src/main/printers.c:755
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Bildstorleken är inte giltig\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, 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:738
+#: src/main/printers.c:782
 #, 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:744
+#: src/main/printers.c:788
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
+
+#: src/main/print-escp2-data.c:553
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Fack"
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapper"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höjd:"
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 #, fuzzy
 msgid "Light Black"
 msgstr "Svart"
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gult"
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte-papper"
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapper"
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glansig film"
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Svart"
@@ -1579,138 +1610,138 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 #, fuzzy
 msgid "Red Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 #, fuzzy
 msgid "Blue Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glansig film"
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 #, fuzzy
 msgid "Automatic"
 msgstr "Storlek"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, 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:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1800,70 +1831,70 @@ msgstr "Sexfärgs foto"
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "Glansig film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1874,8 +1905,8 @@ msgstr "Tungt Ilford-papper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2312,62 +2343,88 @@ msgstr "1440 × 360 DPI högsta kvalitet"
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 × 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "1440 × 360 DPI högsta kvalitet"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 × 360 DPI högsta kvalitet"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "1440 × 360 DPI högsta kvalitet"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "1440 × 360 DPI högsta kvalitet"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
@@ -2455,7 +2512,8 @@ msgid "4x6"
 msgstr "4×6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2942,1526 +3000,3240 @@ msgid "Wide Postcard"
 msgstr "Vykort"
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "Anpassat"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr "89 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:141
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:142
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
+msgid "PostScript Level 1"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
+msgid "PostScript Level 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
+msgid "Canon BJ-30"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
+msgid "Canon BJC-50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
+msgid "Canon BJC-55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
+msgid "Canon BJC-80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
+msgid "Canon BJC-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
+msgid "Canon BJC-210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
+msgid "Canon BJC-240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
+msgid "Canon BJC-250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
+msgid "Canon BJC-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
+msgid "Canon BJC-2010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
+msgid "Canon BJC-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
+msgid "Canon BJC-2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
+msgid "Canon BJC-3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+msgid "Canon BJC-4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
+msgid "Canon BJC-4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
+msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon PIXMA iP4000"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-#, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon BJC-8200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-#, fuzzy
-msgid "EPSON Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon S100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-#, fuzzy
-msgid "EPSON Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon S200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-#, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon S300"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-#, fuzzy
-msgid "EPSON Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon S400"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-#, fuzzy
-msgid "EPSON Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon S450"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-#, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "Stylus C41ux"
+msgid "Canon S500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-#, fuzzy
-msgid "EPSON Stylus C41SX"
-msgstr "Stylus C41ux"
+msgid "Canon S600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-#, fuzzy
-msgid "EPSON Stylus C41UX"
-msgstr "Stylus C41ux"
+msgid "Canon S630"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "Stylus C42ux"
+msgid "Canon S800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-#, fuzzy
-msgid "EPSON Stylus C42SX"
-msgstr "Stylus C42ux"
+msgid "Canon S4500"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-#, fuzzy
-msgid "EPSON Stylus C42UX"
-msgstr "Stylus C42ux"
+msgid "Canon iP4000"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "EPSON Stylus C43SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20SX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "EPSON Stylus C43UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C20UX"
+msgstr "Stylus C20ux"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "EPSON Stylus C44SX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40SX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "EPSON Stylus C44UX"
-msgstr "Stylus C42ux"
+msgid "Epson Stylus C40UX"
+msgstr "Stylus C40ux"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "EPSON Stylus C45"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "EPSON Stylus C46"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41SX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "Stylus C60"
+msgid "Epson Stylus C41UX"
+msgstr "Stylus C41ux"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "EPSON Stylus C50"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "EPSON Stylus C60"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "EPSON Stylus C61"
-msgstr "Stylus C61"
+msgid "Epson Stylus C42UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "EPSON Stylus C62"
-msgstr "Stylus C62"
+msgid "Epson Stylus C43"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "EPSON Stylus C63"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "EPSON Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C43UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "EPSON Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "EPSON Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44SX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C44UX"
+msgstr "Stylus C42ux"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "EPSON Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C45"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "EPSON Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C46"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "EPSON Stylus C82"
-msgstr "Stylus C82"
+msgid "Epson Stylus C48"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "EPSON Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C50"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "EPSON Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C60"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "EPSON Stylus C85"
-msgstr "Stylus C60"
+msgid "Epson Stylus C61"
+msgstr "Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "EPSON Stylus C86"
-msgstr "Stylus C60"
+msgid "Epson Stylus C62"
+msgstr "Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:207
 #, fuzzy
-msgid "EPSON Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C64"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:208
 #, fuzzy
-msgid "EPSON Stylus Color Pro"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C65"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:209
 #, fuzzy
-msgid "EPSON Stylus Color Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C66"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:210
 #, fuzzy
-msgid "EPSON Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:211
 #, fuzzy
-msgid "EPSON Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C70"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
 #, fuzzy
-msgid "EPSON Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C80"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
 #, fuzzy
-msgid "EPSON Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C82"
+msgstr "Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
 #, fuzzy
-msgid "EPSON Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C83"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:215
 #, fuzzy
-msgid "EPSON Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C84"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:216
 #, fuzzy
-msgid "EPSON Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C85"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:217
 #, fuzzy
-msgid "EPSON Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C86"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:218
 #, fuzzy
-msgid "EPSON Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
 #, fuzzy
-msgid "EPSON Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus Color"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
 #, fuzzy
-msgid "EPSON Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus Color I"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
 #, fuzzy
-msgid "EPSON Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus Color II"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
 #, fuzzy
-msgid "EPSON Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus Color IIs"
+msgstr "Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
 #, fuzzy
-msgid "EPSON Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus Color PRO"
+msgstr "Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
 #, fuzzy
-msgid "EPSON Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus Pro XL"
+msgstr "Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
 #, fuzzy
-msgid "EPSON Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus Color 400"
+msgstr "Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
 #, fuzzy
-msgid "EPSON Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus Color 440"
+msgstr "Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
 #, fuzzy
-msgid "EPSON Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus Color 460"
+msgstr "Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
 #, fuzzy
-msgid "EPSON Stylus Color 83"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus Color 480"
+msgstr "Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
 #, fuzzy
-msgid "EPSON Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus Color 500"
+msgstr "Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
 #, fuzzy
-msgid "EPSON Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus Color 580"
+msgstr "Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
 #, fuzzy
-msgid "EPSON Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus Color 600"
+msgstr "Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
 #, fuzzy
-msgid "EPSON Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color 640"
+msgstr "Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
 #, fuzzy
-msgid "EPSON Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color 660"
+msgstr "Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
 #, fuzzy
-msgid "EPSON Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color 670"
+msgstr "Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
 #, fuzzy
-msgid "EPSON Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color 680"
+msgstr "Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
 #, fuzzy
-msgid "EPSON Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 740"
+msgstr "Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
 #, fuzzy
-msgid "EPSON Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 760"
+msgstr "Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "EPSON Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 777"
+msgstr "Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
 #, fuzzy
-msgid "EPSON Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 800"
+msgstr "Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
 #, fuzzy
-msgid "EPSON Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 850"
+msgstr "Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
 #, fuzzy
-msgid "EPSON Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 860"
+msgstr "Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
 #, fuzzy
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 880"
+msgstr "Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
 #, fuzzy
-msgid "EPSON Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 8 3"
+msgstr "Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
 #, fuzzy
-msgid "EPSON Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 900"
+msgstr "Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "EPSON Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 980"
+msgstr "Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
 #, fuzzy
-msgid "EPSON Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 1160"
+msgstr "Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
 #, fuzzy
-msgid "EPSON Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgid "Epson Stylus Color 1500"
+msgstr "Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
 #, fuzzy
-msgid "EPSON Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
+msgstr "Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
 #, fuzzy
-msgid "EPSON Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
+msgstr "Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
 #, fuzzy
-msgid "EPSON Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Photo"
+msgstr "Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
 #, fuzzy
-msgid "EPSON Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
 #, fuzzy
-msgid "EPSON Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo EX"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
 #, fuzzy
-msgid "EPSON Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
+msgstr "Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:254
 #, fuzzy
-msgid "EPSON Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
+msgstr "Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
 #, fuzzy
-msgid "EPSON Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Photo 750"
+msgstr "Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
 #, fuzzy
-msgid "EPSON Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
+msgstr "Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
 #, fuzzy
-msgid "EPSON Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:258
 #, fuzzy
-msgid "EPSON Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
 #, fuzzy
-msgid "EPSON Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
+msgstr "Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
 #, fuzzy
-msgid "EPSON Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
+msgstr "Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
 #, fuzzy
-msgid "EPSON Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
+msgstr "Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:262
 #, fuzzy
-msgid "EPSON Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo 830"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
 #, fuzzy
-msgid "EPSON Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 830U"
+msgstr "Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
 #, fuzzy
-msgid "EPSON Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 870"
+msgstr "Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
 #, fuzzy
-msgid "EPSON Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 875"
+msgstr "Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
 #, fuzzy
-msgid "EPSON Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus Photo 890"
+msgstr "Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
 #, fuzzy
-msgid "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:269
 #, fuzzy
-msgid "EPSON Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 925"
+msgstr "Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:272
 #, fuzzy
-msgid "EPSON Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 950"
+msgstr "Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
 #, fuzzy
-msgid "EPSON Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 960"
+msgstr "Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
 #, fuzzy
-msgid "EPSON Stylus Photo RX425"
+msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
 #, fuzzy
-msgid "EPSON Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1270"
+msgstr "Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
 #, fuzzy
-msgid "EPSON Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1280"
+msgstr "Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
 #, fuzzy
-msgid "EPSON Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 1290"
+msgstr "Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
 #, fuzzy
-msgid "EPSON Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
 #, fuzzy
-msgid "EPSON Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2100"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
 #, fuzzy
-msgid "EPSON Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 2200"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R200"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:282
 #, fuzzy
-msgid "EPSON Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R210"
+msgstr "Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:283
 #, fuzzy
-msgid "EPSON Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo R220"
+msgstr "Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo R300"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:285
 #, fuzzy
-msgid "EPSON Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo R310"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:286
 #, fuzzy
-msgid "EPSON Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo R320"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:287
 #, fuzzy
-msgid "EPSON Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo R340"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:288
 #, fuzzy
-msgid "EPSON Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo RX400"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:289
 #, fuzzy
-msgid "EPSON Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgid "Epson Stylus Photo RX420"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:290
 #, fuzzy
-msgid "EPSON Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo RX425"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:291
 #, fuzzy
-msgid "EPSON Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo RX430"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:292
 #, fuzzy
-msgid "EPSON Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgid "Epson Stylus Photo RX500"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:293
 #, fuzzy
-msgid "EPSON Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo RX510"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:294
 #, fuzzy
-msgid "EPSON Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:295
 #, fuzzy
-msgid "EPSON Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:296
 #, fuzzy
-msgid "EPSON Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:297
 #, fuzzy
-msgid "EPSON Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:298
 #, fuzzy
-msgid "EPSON Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:299
 #, fuzzy
-msgid "EPSON Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:300
 #, fuzzy
-msgid "EPSON Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:301
 #, fuzzy
-msgid "EPSON Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7000"
+msgstr "Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7500"
+msgstr "Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7600"
+msgstr "Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9000"
+msgstr "Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9500"
+msgstr "Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 9600"
+msgstr "Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
 #, fuzzy
-msgid "EPSON Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2000"
+msgstr "Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Scan 2500"
+msgstr "Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
 #, fuzzy
-msgid "EPSON Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX1500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:313
 #, fuzzy
-msgid "EPSON Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX3100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "EPSON Stylus CX5300"
+msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "EPSON Stylus CX5400"
+msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
+msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
+msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "EPSON Stylus CX6300"
+msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "EPSON Stylus CX6400"
+msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:320
 #, fuzzy
-msgid "EPSON Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX3805"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:321
 #, fuzzy
-msgid "EPSON Stylus CX6600"
+msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "EPSON Stylus CX8300"
+msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "EPSON Stylus CX8400"
+msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX4700"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5100"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus CX5200"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
+msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX5400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
+msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "Stylus C60"
+msgid "Epson Stylus CX7700"
+msgstr "Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-#, fuzzy
-msgid "EPSON PM-A900"
-msgstr "Stylus C60"
+msgid "Epson PM 870C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-#, fuzzy
-msgid "EPSON PM-D750"
-msgstr "Stylus C60"
+msgid "Epson PM 880C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-#, fuzzy
-msgid "EPSON PM-D770"
-msgstr "Stylus C60"
+msgid "Epson PM 930C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-#, fuzzy
-msgid "EPSON PM-D1000"
-msgstr "Stylus C60"
+msgid "Epson PM 940C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-#, fuzzy
-msgid "EPSON PM-G700"
-msgstr "Stylus C60"
+msgid "Epson PM 950C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-#, fuzzy
-msgid "EPSON PM-G720"
-msgstr "Stylus C60"
+msgid "Epson PM 970C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-#, fuzzy
-msgid "EPSON PM-G800"
-msgstr "Stylus C60"
+msgid "Epson PM 980C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-#, fuzzy
-msgid "EPSON PM-G820"
-msgstr "Stylus C60"
+msgid "Epson PM 2000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-#, fuzzy
-msgid "EPSON PX-A650"
-msgstr "Stylus C60"
+msgid "Epson PM 2200C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-#, fuzzy
-msgid "EPSON PX-G900"
-msgstr "Stylus C60"
+msgid "Epson PM 3000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-#, fuzzy
-msgid "EPSON PX-G920"
-msgstr "Stylus C60"
+msgid "Epson PM 3300C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-#, fuzzy
-msgid "EPSON PX-G5000"
-msgstr "Stylus C60"
+msgid "Epson PM 3500C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-#, fuzzy
-msgid "EPSON PX-V500"
-msgstr "Stylus C60"
+msgid "Epson PM 3700C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-#, fuzzy
-msgid "EPSON PX-V600"
-msgstr "Stylus C60"
+msgid "Epson PM 4000PX"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-#, fuzzy
-msgid "EPSON PX-5500"
-msgstr "Stylus C60"
+msgid "Epson PM 5000C"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr ""
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr ""
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DesignJet 430"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DesignJet 450C"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DesignJet 455CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DesignJet 488CA"
-msgstr ""
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 500C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 520"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 540C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 550C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 560C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr ""
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr ""
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "Stylus C60"
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 810C"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 812C"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 840C"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 842C"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 845C"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 850C"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 855C"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP DeskJet 870C"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP DeskJet 890C"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP DeskJet 895C"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP DeskJet 1100C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP DeskJet 1120C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP DeskJet 1200C"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP DeskJet 1220C"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP DeskJet 1600C"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "HP LaserJet 4Si"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "HP LaserJet 5Si"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Lexmark 4076"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Lexmark Z42"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Lexmark Z43"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Lexmark Z52"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Lexmark Z53"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Sony UP-DP10"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Sony UP-DR150"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "RAW DATA 16 bit"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "Ange ny skrivare"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "Ange ny skrivare"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "Ange ny skrivare"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "Ange ny skrivare"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:495
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:496
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:502
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:503
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:504
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:505
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:506
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:507
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:508
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:511
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:512
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:513
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:514
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:516
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:518
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:519
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:520
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:522
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:523
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:525
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:526
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:527
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:528
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:529
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:530
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:531
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:532
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:533
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:534
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:535
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:536
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:537
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:538
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:539
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:540
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:541
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:542
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:543
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:544
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:545
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:546
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:547
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:548
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:549
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:550
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:551
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:552
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:553
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:554
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:555
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:556
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:557
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:558
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:559
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:560
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:561
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:562
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:563
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:564
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:565
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:566
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:567
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:568
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:569
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:570
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:571
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:572
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:573
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:574
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:575
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:576
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:577
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:578
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:579
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:580
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:581
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:582
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:583
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:584
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:585
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:586
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:587
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:588
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:589
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:590
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:591
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:592
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:593
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:594
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:595
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:596
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:597
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:598
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:599
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:600
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:601
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:602
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:603
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:604
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:605
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:606
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:607
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:608
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:609
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:610
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:611
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:612
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:613
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:614
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:615
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:616
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:617
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:618
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:619
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:621
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:622
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:623
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:624
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:626
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:627
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:628
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:629
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:630
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:631
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:632
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:633
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:634
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:635
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:636
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:637
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:638
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:639
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:640
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:641
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:642
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:643
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:644
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:645
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:646
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:647
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:648
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:649
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:650
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:651
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:652
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:653
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:654
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:655
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:656
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:657
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:658
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:659
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:660
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:661
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:662
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:663
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:664
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:665
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:666
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:667
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:671
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:672
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:673
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:674
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:675
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:676
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:677
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:678
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:679
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:680
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:681
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:682
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:683
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:684
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:685
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:686
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:687
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:688
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:689
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:690
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:691
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:692
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:693
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:694
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:695
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:698
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:699
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:700
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:701
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:702
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:703
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:704
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:705
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:706
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:707
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:708
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:711
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:712
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:713
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:714
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:715
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:716
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:717
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:718
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:730
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:731
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:732
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:733
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:734
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:735
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:738
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:739
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:740
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:741
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "Skrivarnamn:"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:796
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Konfigurera skrivare"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:864
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:865
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:866
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:867
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:868
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:869
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:870
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:871
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:872
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:873
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:874
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:875
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:876
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:877
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:878
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:879
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:880
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:881
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:882
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:883
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:884
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:885
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:886
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:887
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:888
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:889
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:890
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:891
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -5184,81 +6956,81 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 #, fuzzy
 msgid "Printer Features"
 msgstr "Skrivarinställningar"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Output Control"
 msgstr "Utdatatyp:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Extra 1"
 msgstr "Fack 1"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 2"
 msgstr "Fack 2"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 3"
 msgstr "Fack 3"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 4"
 msgstr "Fack 4"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testutskrift"
 
 # gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
 #
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr "Swedish"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 #, fuzzy
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
@@ -5269,9 +7041,10 @@ msgstr ""
 "vidaredistribuera det under vissa villkor; skriv in \"escputil -l\" för mer\n"
 "information.\n"
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -5321,11 +7094,12 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA\n"
 
-#: src/escputil/escputil.c:116
+#: 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"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -5363,6 +7137,8 @@ msgid ""
 "    -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 ""
 "Användning: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                     [-P skrivare | -r enhet] [-u] [-q] [-m modell]\n"
@@ -5405,12 +7181,13 @@ msgstr ""
 "    -m|--model         Ange den exakta skrivarmodellen för justering av\n"
 "                       huvud.\n"
 
-#: src/escputil/escputil.c:155
+#: src/escputil/escputil.c:161
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -5445,6 +7222,8 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 "Användning: escputil [FLAGGOR] [KOMMANDON]\n"
 "Användning: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
@@ -5482,74 +7261,84 @@ msgstr ""
 "    -q Visa inte rubriken.\n"
 "    -m Ange den exakta skrivarmodellen för justering av huvud.\n"
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan endast ange en skrivare eller rå enhet."
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan endast ange en skrivarmodell."
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Okänd flagga %c\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan inte öppna enheten %s: %s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, 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:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan inte skicka kommando till skrivare\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan inte läsa från %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, 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:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -5558,15 +7347,7 @@ msgstr ""
 "\n"
 "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5577,84 +7358,226 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1017
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1020
 #, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
+msgid "Status: Waiting\n"
+msgstr "Mättnad:"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Fel i indata\n"
+
+#: src/escputil/escputil.c:1064
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Fel i indata\n"
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "Bläckfärg"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: 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:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#, c-format
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1339
 #, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Skrivaren stöder inte färgutskrift\n"
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1371
+#: 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:1389
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan endast ange en skrivarmodell."
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Rensar huvuden...\n"
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
 "skrivaren.\n"
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5728,7 +7651,7 @@ msgstr ""
 "Det är viktigt att du inte stänger av din skrivare under denna process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5796,12 +7719,17 @@ msgstr ""
 "process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5820,20 +7748,20 @@ msgstr ""
 "Du kommer att få bekräfta ditt val.\n"
 "Vad vill du göra (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n"
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5842,7 +7770,7 @@ msgstr ""
 "OK, din skrivare är justerad, men justeringen har inte sparats.\n"
 "Om du vill spara justeringen måste du upprepa detta förlopp.\n"
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5851,12 +7779,12 @@ msgstr ""
 "Bekräfta att du vill upprepa justeringsprocessen genom att\n"
 "ange \"r\" igen:\n"
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Upprepar justeringsprocessen.\n"
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5871,17 +7799,17 @@ msgstr ""
 "Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
 "\"s\" igen:\n"
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "Kommer att spara inställningar..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "misslyckades!\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5890,27 +7818,27 @@ msgstr ""
 "Dina inställningar sparades inte utan problem. Du måste upprepa\n"
 "justeringsproceduren.\n"
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "lyckades!\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Okänt kommando.\n"
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Sista kommandot bekräftades inte.\n"
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5927,12 +7855,12 @@ msgstr ""
 "Placera ett pappersark i skrivaren för att påbörja justeringen\n"
 "av huvudena.\n"
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "Tryck retur för att fortsätta > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5943,42 +7871,42 @@ msgstr ""
 "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
 "proceduren.\n"
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass %d"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Mata in ett nytt pappersark.\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numret är utanför intervallet!\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jag kan inte förstå vad du skrev!\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, 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:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Försöker ställa in justering..."
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "lyckades.\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5991,7 +7919,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:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr "Fel i indata\n"
@@ -6000,11 +7928,11 @@ msgstr "Fel i indata\n"
 msgid "Printing..."
 msgstr "Skriver ut..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/Arkiv/Skriv ut..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -6016,484 +7944,562 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr "Felaktigt färgutrymme: bps %d kanaler %d utrymme %s\n"
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr "Ingen radbuffert\n"
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr "Kan inte tolka parametern %s=%s (ett tal förväntas)\n"
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "Skrivaren måste anges med -sModel\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "Skrivaren %s är inte en känd modell\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr "Okänd skrivare %s\n"
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
 
-#: src/ghost/ijsgutenprint.c:1221
-#, fuzzy, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr "ijs_server_get_page_header misslyckades %d\n"
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr "image_init misslyckades %d\n"
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr "Kan inte öppna fildeskriptor: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr "Okänd skrivare %s\n"
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr "Felaktiga parametrar; kan inte fortsätta!\n"
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
 
 #, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan inte tolka utdata från skrivare\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Justera gulbalansen på utskriften"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Skrivarstatus kräver att en rå enhet används.\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Justera gulbalansen på utskriften"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Skrivarjustering måste göras med en rå enhet. I annat fall\n"
-#~ "måste flaggan -m användas för att ange en skrivare.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Försöker detektera skrivarmodell..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Kan inte öppna %s för läsning/skrivning: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Skrivarmodellen %s är okänd.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Om Gimp-Print "
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Ställ in ljusstyrkan på utskriften.\n"
-#~ "0 är helt svart, 2 är helt vitt"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Ange rätt kommando för atyy skriva ut till din skrivare. Obs: Ta inte "
-#~ "bort \"-l\" eller \"-oraw\" från kommandosträngen. Om du gör detta kommer "
-#~ "utskriften troligtvis att misslyckas!"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD-fil?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: flaggan \"%s\" är flertydig\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: flaggan \"%s\" kräver ett argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: okänd flagga \"--%s\"\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: okänd flagga \"%c%s\"\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: illegal flagga -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ogiltig flagga -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: flaggan kräver ett argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: flaggan \"-W %s\" är flertydig\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Ljusstyrka:"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Skala utskriften till storleken på sidan"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Rullmatning"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI enkelriktad"
-
-#~ msgid "24x36"
-#~ msgstr "24×36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f av %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimera utdata för den typ av bild som skrivs ut"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Enstaka färger"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C41sx"
-
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C41ux"
-
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C42sx"
-
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C42ux"
+#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgstr "ijs_server_get_page_header misslyckades %d\n"
 
 #, fuzzy
-#~ msgid "Stylus C50"
+#~ msgid "EPSON Stylus C50"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C60"
+#, fuzzy
+#~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
-#~ msgid "Stylus C61"
+#, fuzzy
+#~ msgid "EPSON Stylus C61"
 #~ msgstr "Stylus C61"
 
-#~ msgid "Stylus C62"
+#, fuzzy
+#~ msgid "EPSON Stylus C62"
 #~ msgstr "Stylus C62"
 
-#~ msgid "Stylus C70"
+#, fuzzy
+#~ msgid "EPSON Stylus C70"
 #~ msgstr "Stylus C70"
 
-#~ msgid "Stylus C80"
+#, fuzzy
+#~ msgid "EPSON Stylus C80"
 #~ msgstr "Stylus C80"
 
-#~ msgid "Stylus C82"
+#, fuzzy
+#~ msgid "EPSON Stylus C82"
 #~ msgstr "Stylus C82"
 
-#~ msgid "Stylus Color"
+#, fuzzy
+#~ msgid "EPSON Stylus Color"
 #~ msgstr "Stylus Color"
 
-#~ msgid "Stylus Color Pro"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "Stylus Color Pro"
 
-#~ msgid "Stylus Color Pro XL"
+#, fuzzy
+#~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "Stylus Color Pro XL"
 
-#~ msgid "Stylus Color 400"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 400"
 #~ msgstr "Stylus Color 400"
 
-#~ msgid "Stylus Color 440"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 440"
 #~ msgstr "Stylus Color 440"
 
-#~ msgid "Stylus Color 460"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 460"
 #~ msgstr "Stylus Color 460"
 
-#~ msgid "Stylus Color 480"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 480"
 #~ msgstr "Stylus Color 480"
 
-#~ msgid "Stylus Color 500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 500"
 #~ msgstr "Stylus Color 500"
 
-#~ msgid "Stylus Color 580"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 580"
 #~ msgstr "Stylus Color 580"
 
-#~ msgid "Stylus Color 600"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 600"
 #~ msgstr "Stylus Color 600"
 
-#~ msgid "Stylus Color 640"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 640"
 #~ msgstr "Stylus Color 640"
 
-#~ msgid "Stylus Color 660"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 660"
 #~ msgstr "Stylus Color 660"
 
-#~ msgid "Stylus Color 670"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 670"
 #~ msgstr "Stylus Color 670"
 
-#~ msgid "Stylus Color 680"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 680"
 #~ msgstr "Stylus Color 680"
 
-#~ msgid "Stylus Color 740"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 740"
 #~ msgstr "Stylus Color 740"
 
-#~ msgid "Stylus Color 760"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 760"
 #~ msgstr "Stylus Color 760"
 
-#~ msgid "Stylus Color 777"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 777"
 #~ msgstr "Stylus Color 777"
 
-#~ msgid "Stylus Color 800"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 800"
 #~ msgstr "Stylus Color 800"
 
-#~ msgid "Stylus Color 850"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 850"
 #~ msgstr "Stylus Color 850"
 
-#~ msgid "Stylus Color 860"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 860"
 #~ msgstr "Stylus Color 860"
 
-#~ msgid "Stylus Color 880"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 880"
 #~ msgstr "Stylus Color 880"
 
-#~ msgid "Stylus Color 83"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 83"
 #~ msgstr "Stylus Color 83"
 
-#~ msgid "Stylus Color 900"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 900"
 #~ msgstr "Stylus Color 900"
 
-#~ msgid "Stylus Color 980"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 980"
 #~ msgstr "Stylus Color 980"
 
-#~ msgid "Stylus Color 1160"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1160"
 #~ msgstr "Stylus Color 1160"
 
-#~ msgid "Stylus Color 1500"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "Stylus Color 1500"
 
-#~ msgid "Stylus Color 1520"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "Stylus Color 1520"
 
-#~ msgid "Stylus Color 3000"
+#, fuzzy
+#~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "Stylus Color 3000"
 
-#~ msgid "Stylus Photo"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo"
 #~ msgstr "Stylus Photo"
 
-#~ msgid "Stylus Photo 700"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo EX"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "Stylus Photo EX"
 
-#~ msgid "Stylus Photo 720"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 720"
 #~ msgstr "Stylus Photo 720"
 
-#~ msgid "Stylus Photo 750"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 750"
 #~ msgstr "Stylus Photo 750"
 
-#~ msgid "Stylus Photo 780"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 780"
 #~ msgstr "Stylus Photo 780"
 
-#~ msgid "Stylus Photo 785"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "Stylus Photo 785"
 
-#~ msgid "Stylus Photo 790"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 790"
 #~ msgstr "Stylus Photo 790"
 
-#~ msgid "Stylus Photo 810"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 810"
 #~ msgstr "Stylus Photo 810"
 
-#~ msgid "Stylus Photo 820"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 820"
 #~ msgstr "Stylus Photo 820"
 
-#~ msgid "Stylus Photo 830"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 830"
 #~ msgstr "Stylus Photo 830"
 
-#~ msgid "Stylus Photo 870"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 870"
 #~ msgstr "Stylus Photo 870"
 
-#~ msgid "Stylus Photo 875"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 875"
 #~ msgstr "Stylus Photo 875"
 
-#~ msgid "Stylus Photo 890"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 890"
 #~ msgstr "Stylus Photo 890"
 
-#~ msgid "Stylus Photo 895"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 895"
 #~ msgstr "Stylus Photo 895"
 
 #, fuzzy
-#~ msgid "Stylus Photo 900"
+#~ msgid "EPSON Stylus Photo 900"
 #~ msgstr "Stylus Photo 700"
 
-#~ msgid "Stylus Photo 915"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 915"
 #~ msgstr "Stylus Photo 915"
 
-#~ msgid "Stylus Photo 925"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 925"
 #~ msgstr "Stylus Photo 925"
 
-#~ msgid "Stylus Photo 950"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 950"
 #~ msgstr "Stylus Photo 950"
 
-#~ msgid "Stylus Photo 960"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 960"
 #~ msgstr "Stylus Photo 960"
 
-#~ msgid "Stylus Photo 1200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1200"
 #~ msgstr "Stylus Photo 1200"
 
-#~ msgid "Stylus Photo 1270"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1270"
 #~ msgstr "Stylus Photo 1270"
 
-#~ msgid "Stylus Photo 1280"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1280"
 #~ msgstr "Stylus Photo 1280"
 
-#~ msgid "Stylus Photo 1290"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 1290"
 #~ msgstr "Stylus Photo 1290"
 
-#~ msgid "Stylus Photo 2000P"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2000P"
 #~ msgstr "Stylus Photo 2000P"
 
-#~ msgid "Stylus Photo 2100"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2100"
 #~ msgstr "Stylus Photo 2100"
 
-#~ msgid "Stylus Photo 2200"
+#, fuzzy
+#~ msgid "EPSON Stylus Photo 2200"
 #~ msgstr "Stylus Photo 2200"
 
-#~ msgid "Stylus Pro 5000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5000"
 #~ msgstr "Stylus Pro 5000"
 
-#~ msgid "Stylus Pro 5500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
-#~ msgid "Stylus Pro 7000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7000"
 #~ msgstr "Stylus Pro 7000"
 
-#~ msgid "Stylus Pro 7500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7500"
 #~ msgstr "Stylus Pro 7500"
 
-#~ msgid "Stylus Pro 7600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 7600"
 #~ msgstr "Stylus Pro 7600"
 
-#~ msgid "Stylus Pro 9000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9000"
 #~ msgstr "Stylus Pro 9000"
 
-#~ msgid "Stylus Pro 9500"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9500"
 #~ msgstr "Stylus Pro 9500"
 
-#~ msgid "Stylus Pro 9600"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 9600"
 #~ msgstr "Stylus Pro 9600"
 
-#~ msgid "Stylus Pro 10000"
+#, fuzzy
+#~ msgid "EPSON Stylus Pro 10000"
 #~ msgstr "Stylus Pro 10000"
 
-#~ msgid "Stylus Scan 2000"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2000"
 #~ msgstr "Stylus Scan 2000"
 
-#~ msgid "Stylus Scan 2500"
+#, fuzzy
+#~ msgid "EPSON Stylus Scan 2500"
 #~ msgstr "Stylus Scan 2500"
 
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Skrivaren stöder inte färgutskrift\n"
+
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan inte tolka utdata från skrivare\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Justera gulbalansen på utskriften"
+
+#~ msgid "Printer status requires using a raw device.\n"
+#~ msgstr "Skrivarstatus kräver att en rå enhet används.\n"
+
+#, fuzzy
+#~ msgid "Gloss Balance"
+#~ msgstr "Justera gulbalansen på utskriften"
+
+#~ msgid ""
+#~ "Printer alignment must be done with a raw device or else\n"
+#~ "the -m option must be used to specify a printer.\n"
+#~ msgstr ""
+#~ "Skrivarjustering måste göras med en rå enhet. I annat fall\n"
+#~ "måste flaggan -m användas för att ange en skrivare.\n"
+
+#~ msgid "Attempting to detect printer model..."
+#~ msgstr "Försöker detektera skrivarmodell..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot open %s read/write: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kan inte öppna %s för läsning/skrivning: %s\n"
+
+#~ msgid "Printer model %s is not known.\n"
+#~ msgstr "Skrivarmodellen %s är okänd.\n"
+
+#, fuzzy
+#~ msgid "Gimp-Print"
+#~ msgstr "Om Gimp-Print "
+
+#, fuzzy
+#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
+#~ msgstr ""
+#~ "Ställ in ljusstyrkan på utskriften.\n"
+#~ "0 är helt svart, 2 är helt vitt"
+
+#~ msgid ""
+#~ "Enter the correct command to print to your printer. Note: Please do not "
+#~ "remove the `-l' or `-oraw' from the command string, or printing will "
+#~ "probably fail!"
+#~ msgstr ""
+#~ "Ange rätt kommando för atyy skriva ut till din skrivare. Obs: Ta inte "
+#~ "bort \"-l\" eller \"-oraw\" från kommandosträngen. Om du gör detta kommer "
+#~ "utskriften troligtvis att misslyckas!"
+
+#~ msgid "PPD File?"
+#~ msgstr "PPD-fil?"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: flaggan \"%s\" är flertydig\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: okänd flagga \"--%s\"\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: illegal flagga -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ogiltig flagga -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: flaggan kräver ett argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
+
+#, fuzzy
+#~ msgid "Bright"
+#~ msgstr "Ljusstyrka:"
+
+#, fuzzy
+#~ msgid "Image is too wide for the page\n"
+#~ msgstr "Skala utskriften till storleken på sidan"
+
+#, fuzzy
+#~ msgid "Full Bleed"
+#~ msgstr "Rullmatning"
+
+#, fuzzy
+#~ msgid "traditional"
+#~ msgstr "600 DPI enkelriktad"
+
+#~ msgid "24x36"
+#~ msgstr "24×36"
+
+#~ msgid "%.0f of %.0f\n"
+#~ msgstr "%.0f av %.0f\n"
+
+#~ msgid "ps2"
+#~ msgstr "ps2"
+
+#, fuzzy
+#~ msgid "Optimize the settings for the type of image to be printed"
+#~ msgstr "Optimera utdata för den typ av bild som skrivs ut"
+
+#~ msgid "Solid Colors"
+#~ msgstr "Enstaka färger"
+
+#~ msgid "Stylus C20sx"
+#~ msgstr "Stylus C20sx"
+
+#~ msgid "Stylus C20ux"
+#~ msgstr "Stylus C20ux"
+
+#~ msgid "Stylus C40sx"
+#~ msgstr "Stylus C40sx"
+
+#~ msgid "Stylus C40ux"
+#~ msgstr "Stylus C40ux"
+
+#~ msgid "Stylus C41sx"
+#~ msgstr "Stylus C41sx"
+
+#~ msgid "Stylus C41ux"
+#~ msgstr "Stylus C41ux"
+
+#~ msgid "Stylus C42sx"
+#~ msgstr "Stylus C42sx"
+
+#~ msgid "Stylus C42ux"
+#~ msgstr "Stylus C42ux"
+
 #~ msgid ""
 #~ "Please read these instructions very carefully before proceeding.\n"
 #~ "\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 62ac886..a915bbb 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d860213..3a3dd74 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0-b5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-14 15:38-0500\n"
+"POT-Creation-Date: 2006-05-12 20:55-0400\n"
 "PO-Revision-Date: 2005-08-07 12:56+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1529
 msgid "Default"
 msgstr "�設"
 
@@ -71,12 +71,12 @@ msgstr ""
 msgid "Density"
 msgstr "密度"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1519
-#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
-#: src/main/print-escp2.c:420 src/main/print-escp2.c:428
-#: src/main/print-escp2.c:436 src/main/print-escp2.c:444
-#: src/main/print-escp2.c:452 src/main/print-escp2.c:460
+#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
+#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
+#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
 #: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
@@ -137,187 +137,187 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI"
 msgstr "90x90 DPI"
 
-#: src/main/print-canon.c:1367
+#: src/main/print-canon.c:1382
 msgid "90x90 DPI DMT"
 msgstr "90x90 DPI DMT"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI"
 msgstr "180x180 DPI"
 
-#: src/main/print-canon.c:1368
+#: src/main/print-canon.c:1383
 msgid "180x180 DPI DMT"
 msgstr "180x180 DPI DMT"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI"
 msgstr "360x360 DPI"
 
-#: src/main/print-canon.c:1369
+#: src/main/print-canon.c:1384
 msgid "360x360 DPI DMT"
 msgstr "360x360 DPI DMT"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI"
 msgstr "720x360 DPI"
 
-#: src/main/print-canon.c:1370
+#: src/main/print-canon.c:1385
 msgid "720x360 DPI DMT"
 msgstr "720x360 DPI DMT"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI"
 msgstr "720x720 DPI"
 
-#: src/main/print-canon.c:1371
+#: src/main/print-canon.c:1386
 msgid "720x720 DPI DMT"
 msgstr "720x720 DPI DMT"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI"
 msgstr "1440x720 DPI"
 
-#: src/main/print-canon.c:1372
+#: src/main/print-canon.c:1387
 msgid "1440x720 DPI DMT"
 msgstr "1440x720 DPI DMT"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI"
 msgstr "1440x1440 DPI"
 
-#: src/main/print-canon.c:1373
+#: src/main/print-canon.c:1388
 msgid "1440x1440 DPI DMT"
 msgstr "1440x1440 DPI DMT"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI"
 msgstr "2880x2880 DPI"
 
-#: src/main/print-canon.c:1374
+#: src/main/print-canon.c:1389
 msgid "2880x2880 DPI DMT"
 msgstr "2880x2880 DPI DMT"
 
-#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1375
+#: src/main/print-canon.c:1390
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI DMT"
 
-#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1376
+#: src/main/print-canon.c:1391
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI DMT"
 
-#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1377
+#: src/main/print-canon.c:1392
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI DMT"
 
-#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1378
+#: src/main/print-canon.c:1393
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI DMT"
 
-#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1379
+#: src/main/print-canon.c:1394
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI DMT"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI"
 msgstr "1200x1200 DPI"
 
-#: src/main/print-canon.c:1380
+#: src/main/print-canon.c:1395
 msgid "1200x1200 DPI DMT"
 msgstr "1200x1200 DPI DMT"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI"
 msgstr "2400x2400 DPI"
 
-#: src/main/print-canon.c:1381
+#: src/main/print-canon.c:1396
 msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
 #: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
 #: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
 #: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
 msgid "Plain Paper"
 msgstr "普通紙張"
 
-#: src/main/print-canon.c:1433
+#: src/main/print-canon.c:1448
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "普通紙張"
 
-#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
 #: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
 #: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
 #: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
 msgid "Transparencies"
 msgstr "�明膠片"
 
-#: src/main/print-canon.c:1435
+#: src/main/print-canon.c:1450
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1436
+#: src/main/print-canon.c:1451
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1437
+#: src/main/print-canon.c:1452
 msgid "Envelope"
 msgstr "ä¿¡å°�"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1438
+#: src/main/print-canon.c:1453
 msgid "High Resolution Paper"
 msgstr "高解�度彩色專用紙"
 
 # (Abel) from www.easyoffice.com.tw
-#: src/main/print-canon.c:1439
+#: src/main/print-canon.c:1454
 msgid "T-Shirt Transfers"
 msgstr "T�轉�紙"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1440
+#: src/main/print-canon.c:1455
 msgid "High Gloss Film"
 msgstr "影�寫真光澤膠片"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1441
+#: src/main/print-canon.c:1456
 msgid "Glossy Photo Paper"
 msgstr "影�寫真光澤紙"
 
-#: src/main/print-canon.c:1442
+#: src/main/print-canon.c:1457
 msgid "Glossy Photo Cards"
 msgstr ""
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1443
+#: src/main/print-canon.c:1458
 msgid "Photo Paper Pro"
 msgstr "專業級相紙"
 
-#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
 #: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
 #: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
 #: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
@@ -325,15 +325,15 @@ msgstr "專業級相紙"
 msgid "Other"
 msgstr "其它"
 
-#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
 #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr "��尺寸"
 
-#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
-#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
+#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
+#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
 #: src/main/print-escp2.c:183 src/main/print-escp2.c:189
 #: src/main/print-escp2.c:195 src/main/print-escp2.c:213
 #: src/main/print-escp2.c:230 src/main/print-escp2.c:236
@@ -349,55 +349,55 @@ msgstr "��尺寸"
 msgid "Basic Printer Setup"
 msgstr "基本�表機設定"
 
-#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
-#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
-#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
 msgid "Media Source"
 msgstr "紙張來�"
 
-#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
 #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
 msgid "Resolution"
 msgstr "解�度"
 
-#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
 #: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
 #: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
-#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
 #: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
@@ -406,21 +406,21 @@ msgstr "墨水類別"
 msgid "Advanced Printer Setup"
 msgstr "進階�表機設定"
 
-#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
 #: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
 
-#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
+#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -430,13 +430,13 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr "進階�表機功能"
 
-#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
 #: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
-#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-canon.c:1505 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
 #: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
@@ -445,156 +445,157 @@ msgstr "列�模�"
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
 #: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
 msgid "Double-Sided Printing"
 msgstr "雙�列�"
 
-#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
-#: src/main/print-escp2.c:468 src/main/print-escp2.c:469
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
+#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
-#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:484
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:500
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
+#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
 #: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
 #: src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
-#: src/main/print-escp2.c:476 src/main/print-escp2.c:477
+#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
+#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
+#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
-#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
-#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
 msgstr "自動�紙匣"
 
-#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1904
+#: src/main/print-canon.c:1923
 msgid "Cassette"
 msgstr ""
 
-#: src/main/print-canon.c:1905
+#: src/main/print-canon.c:1924
 msgid "CD tray"
 msgstr ""
 
-#: src/main/print-canon.c:2017 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
-#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:647
-#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
-#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
-#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
-#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
-msgid "Black"
-msgstr "黑"
+#: src/main/print-canon.c:2049
+msgid "Photo CcMmYK Color"
+msgstr ""
 
-#: src/main/print-canon.c:2020
-msgid "CMY Color"
-msgstr "CMY 色系"
+#: src/main/print-canon.c:2052
+msgid "Photo CcMmY Color"
+msgstr ""
 
-#: src/main/print-canon.c:2023
+#: src/main/print-canon.c:2055
 msgid "CMYK Color"
 msgstr "CMYK 色系"
 
-#: src/main/print-canon.c:2026
-msgid "Photo CcMmY Color"
-msgstr ""
+#: src/main/print-canon.c:2058
+msgid "CMY Color"
+msgstr "CMY 色系"
 
-#: src/main/print-canon.c:2029
-msgid "Photo CcMmYK Color"
-msgstr ""
+#: src/main/print-canon.c:2061 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
+#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
+#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
+#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
+#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
+#: src/escputil/escputil.c:1190
+msgid "Black"
+msgstr "黑"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
-#: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "黑白"
@@ -778,14 +779,15 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
-#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
-#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
-#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
-#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
-#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
+#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
+#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
+#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
+#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
 #: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
+#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1191
 msgid "Cyan"
 msgstr "æ°°è—�"
 
@@ -793,14 +795,15 @@ msgstr "æ°°è—�"
 msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
-#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
-#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
-#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
-#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
-#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
 #: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
+#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1192
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
@@ -808,14 +811,15 @@ msgstr "æ´‹ç´…"
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
-#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
-#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
-#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
-#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
+#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
 #: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
+#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:1193
 msgid "Yellow"
 msgstr "黃"
 
@@ -823,10 +827,10 @@ msgstr "黃"
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
-#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
-#: src/escputil/escputil.c:893
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
+#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
+#: src/escputil/escputil.c:995
 msgid "Red"
 msgstr "ç´…"
 
@@ -843,10 +847,10 @@ msgstr "綠"
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
-#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
-#: src/escputil/escputil.c:894
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
+#: src/escputil/escputil.c:996
 msgid "Blue"
 msgstr "è—�"
 
@@ -1060,216 +1064,242 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:459
+#: src/main/printers.c:503
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:472 src/main/printers.c:477
+#: src/main/printers.c:516 src/main/printers.c:521
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:496
+#: src/main/printers.c:540
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s 必須在 %f 和 %f 之間 (實際上是 %f)\n"
 
-#: src/main/printers.c:518 src/main/printers.c:542
+#: src/main/printers.c:562 src/main/printers.c:586
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s 必須在 %d 和 %d 之間 (實際上是 %d)\n"
 
-#: src/main/printers.c:573
+#: src/main/printers.c:617
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s 必須在 %f 和 %f 之間\n"
 
-#: src/main/printers.c:581
+#: src/main/printers.c:625
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:585
+#: src/main/printers.c:629
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:673
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:642 src/main/printers.c:653
+#: src/main/printers.c:686 src/main/printers.c:697
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:711
+#: src/main/printers.c:755
 msgid "Page size is not valid\n"
 msgstr "��尺寸無效\n"
 
-#: src/main/printers.c:732
+#: src/main/printers.c:776
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "頂部邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:738
+#: src/main/printers.c:782
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "左邊邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:744
+#: src/main/printers.c:788
 msgid "Height must be greater than zero\n"
 msgstr "高度必須大於零\n"
 
-#: src/main/printers.c:750
+#: src/main/printers.c:794
 msgid "Width must be greater than zero\n"
 msgstr "寬度必須大於零\n"
 
-#: src/main/printers.c:756
+#: src/main/printers.c:800
 #, 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:763
+#: src/main/printers.c:807
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
-#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
-#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
-#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
+#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
+#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
+#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
 #: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
 #: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "標準"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
-#: src/main/print-escp2-data.c:477
+#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
+#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
+#: src/main/print-escp2-data.c:604
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
 msgid "Manual Feed"
 msgstr "人手�紙"
 
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
+#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
 msgid "Print to CD"
 msgstr "列�至光碟"
 
-#: src/main/print-escp2-data.c:496
+#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "人手�紙"
+
+#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "人手�紙"
+
+#: src/main/print-escp2-data.c:553
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:562
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/print-escp2-data.c:580
+#, fuzzy
+msgid "Photo Board"
+msgstr "相紙"
+
+#: src/main/print-escp2-data.c:619
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:505
+#: src/main/print-escp2-data.c:628
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:514
+#: src/main/print-escp2-data.c:637
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:523
+#: src/main/print-escp2-data.c:646
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
 #: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
 #: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
+#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
-#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
-#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "相片"
 
-#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
-#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
-#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
-#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
-#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
-#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
-#: src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
-#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
-#: src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
+#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
-#: src/escputil/escputil.c:873
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:975
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:810
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
+#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
+#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
 msgid "Light Light Black"
 msgstr ""
 
@@ -1440,122 +1470,122 @@ msgstr ""
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:444
+#: src/main/print-escp2.c:445
 msgid "Red Density"
 msgstr "紅色密度"
 
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:446
 msgid "Adjust the red density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:452
+#: src/main/print-escp2.c:453
 msgid "Blue Density"
 msgstr "�色密度"
 
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:454
 msgid "Adjust the blue density"
 msgstr "調整�色色彩密度"
 
-#: src/main/print-escp2.c:460
+#: src/main/print-escp2.c:461
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:462
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:484 src/main/print-escp2.c:485
+#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:492 src/main/print-escp2.c:493
+#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:500 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
+#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516
+#: src/main/print-escp2.c:517
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:518
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1443
+#: src/main/print-escp2.c:1445
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1447
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-escp2.c:1480
+#: src/main/print-escp2.c:1482
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1484
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
+#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1621
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1623
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1652
+#: src/main/print-escp2.c:1654
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1656
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1658
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1660
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1662
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2057
+#: src/main/print-escp2.c:2087
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1642,14 +1672,14 @@ msgid "Five Color Photo Composite"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1166
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
 #: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
 #: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
 #: src/main/escp2-papers.c:1394
 msgid "Glossy Film"
 msgstr "光�膠片"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1170
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
 #: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
 #: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
 #: src/main/escp2-papers.c:1398
@@ -1657,7 +1687,7 @@ msgid "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1174
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
 #: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
 #: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
 #: src/main/escp2-papers.c:1402
@@ -1665,7 +1695,7 @@ msgid "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1178
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
 #: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
 #: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
 #: src/main/escp2-papers.c:1406
@@ -1673,14 +1703,14 @@ msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
 #: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
 #: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
 #: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
 #: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
 #: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
 #: src/main/escp2-papers.c:1410
@@ -1688,7 +1718,7 @@ msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
 #: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
 #: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
 #: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
@@ -1696,7 +1726,7 @@ msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
 #: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
 #: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
 #: src/main/escp2-papers.c:1416
@@ -1704,14 +1734,14 @@ msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
 #: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
 #: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
 #: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
 #: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
 #: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
 #: src/main/escp2-papers.c:1424
@@ -1722,8 +1752,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
-#: src/cups/genppd.c:1470
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
+#: src/cups/genppd.c:1516
 msgid "None"
 msgstr ""
 
@@ -2103,58 +2133,84 @@ msgstr "2880 x 720 DPI 最高�質"
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
+#: src/main/escp2-resolutions.c:142
+#, fuzzy
+msgid "1440 x 1440"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:145
+#, fuzzy
+msgid "1440 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI 最高�質"
+
+#: src/main/escp2-resolutions.c:148
+#, fuzzy
+msgid "1440 x 1440 DPI Highest Quality"
+msgstr "1440 x 720 DPI 最高�質"
+
+#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
+#: src/main/escp2-resolutions.c:161
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:153
+#: src/main/escp2-resolutions.c:164
+#, fuzzy
+msgid "2880 x 1440 DPI High Quality"
+msgstr "2880 x 720 DPI 最高�質"
+
+#: src/main/escp2-resolutions.c:167
+#, fuzzy
+msgid "2880 x 1440 DPI Highest Quality"
+msgstr "2880 x 720 DPI 最高�質"
+
+#: src/main/escp2-resolutions.c:171
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
+#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
+#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:548
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
-#: src/main/escp2-resolutions.c:511
+#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
+#: src/main/escp2-resolutions.c:579
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
-#: src/main/escp2-resolutions.c:512
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
+#: src/main/escp2-resolutions.c:580
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
-#: src/main/escp2-resolutions.c:513
+#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
+#: src/main/escp2-resolutions.c:581
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
-#: src/main/escp2-resolutions.c:514
+#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
+#: src/main/escp2-resolutions.c:582
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
+#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:516
+#: src/main/escp2-resolutions.c:584
 msgid "Eight Pass"
 msgstr ""
 
@@ -2235,7 +2291,8 @@ msgid "4x6"
 msgstr "4x6"
 
 #: src/main/xmli18n-tmp.h:10
-msgid "Epson 4x6 Photo Paper"
+#, fuzzy
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
 #: src/main/xmli18n-tmp.h:11
@@ -2715,1388 +2772,3539 @@ msgid "Wide Postcard"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:131
+msgid "Chilean Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:132
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:133
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:134
 msgid "Custom"
 msgstr "自�"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:135
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:136
 msgid "4 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:137
 msgid "5 Inch Roll Paper"
 msgstr "5 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:138
 msgid "210 mm Roll Paper"
 msgstr "210 毫米滾筒紙"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:139
 msgid "13 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:140
 msgid "22 Inch Roll Paper"
 msgstr "22 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:141
 msgid "24 Inch Roll Paper"
 msgstr "24 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:142
 msgid "36 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:143
 msgid "44 Inch Roll Paper"
 msgstr "44 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:144
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
-msgid "Canon BJC 30"
-msgstr "Canon BJC 30"
-
-#: src/main/xmli18n-tmp.h:144
-msgid "Canon BJC 50"
-msgstr "Canon BJC 50"
-
-#: src/main/xmli18n-tmp.h:145
-msgid "Canon BJC 55"
-msgstr "Canon BJC 55"
-
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJC 80"
-msgstr "Canon BJC 80"
+#, fuzzy
+msgid "Canon BJ-30"
+msgstr "Canon BJC 30"
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC 85"
-msgstr "Canon BJC 85"
+#, fuzzy
+msgid "Canon BJC-50"
+msgstr "Canon BJC 50"
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC 210"
-msgstr "Canon BJC 210"
+#, fuzzy
+msgid "Canon BJC-55"
+msgstr "Canon BJC 55"
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC 240"
-msgstr "Canon BJC 240"
+#, fuzzy
+msgid "Canon BJC-80"
+msgstr "Canon BJC 80"
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC 250"
-msgstr "Canon BJC 250"
+#, fuzzy
+msgid "Canon BJC-85"
+msgstr "Canon BJC 85"
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC 1000"
-msgstr "Canon BJC 1000"
+#, fuzzy
+msgid "Canon BJC-210"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC 2000"
-msgstr "Canon BJC 2000"
+#, fuzzy
+msgid "Canon BJC-240"
+msgstr "Canon BJC 240"
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC 3000"
-msgstr "Canon BJC 3000"
+#, fuzzy
+msgid "Canon BJC-250"
+msgstr "Canon BJC 250"
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC 4300"
-msgstr "Canon BJC 4300"
+#, fuzzy
+msgid "Canon BJC-1000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:155
 #, fuzzy
-msgid "Canon BJC 4400 photo"
-msgstr "Canon BJC 4400 photo"
+msgid "Canon BJC-2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC 6000"
-msgstr "Canon BJC 6000"
+#, fuzzy
+msgid "Canon BJC-2010"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC 6100"
-msgstr "Canon BJC 6100"
+#, fuzzy
+msgid "Canon BJC-2100"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC 6200"
-msgstr "Canon BJC 6200"
+#, fuzzy
+msgid "Canon BJC-2110"
+msgstr "Canon BJC 210"
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC 6500"
-msgstr "Canon BJC 6500"
+#, fuzzy
+msgid "Canon BJC-3000"
+msgstr "Canon BJC 3000"
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC 7000"
+#, fuzzy
+msgid "Canon BJC-4000"
 msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC 7100"
-msgstr "Canon BJC 7100"
+#, fuzzy
+msgid "Canon BJC-4300"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC 8200"
-msgstr "Canon BJC 8200"
+#, fuzzy
+msgid "Canon BJC-4400"
+msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:163
 #, fuzzy
-msgid "Canon S200"
-msgstr "Canon S400"
+msgid "Canon BJC-6000"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S400"
-msgstr "Canon S400"
+#, fuzzy
+msgid "Canon BJC-6100"
+msgstr "Canon BJC 6100"
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S450"
-msgstr "Canon S450"
+#, fuzzy
+msgid "Canon BJC-6200"
+msgstr "Canon BJC 6200"
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S800"
-msgstr "Canon S800"
+#, fuzzy
+msgid "Canon BJC-6500"
+msgstr "Canon BJC 6500"
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon S4500"
-msgstr "Canon S4500"
+#, fuzzy
+msgid "Canon BJC-7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:168
 #, fuzzy
-msgid "Canon PIXMA iP4000"
-msgstr "Canon S400"
+msgid "Canon BJC-7100"
+msgstr "Canon BJC 7100"
 
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
-msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20UX"
+msgid "Canon BJC-8200"
+msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+#, fuzzy
+msgid "Canon S100"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+#, fuzzy
+msgid "Canon S200"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
-msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S300"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
-msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41UX"
+msgid "Canon S500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+#, fuzzy
+msgid "Canon S600"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+#, fuzzy
+msgid "Canon S630"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:178
-#, fuzzy
-msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42UX"
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+#, fuzzy
+msgid "Canon iP4000"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43UX"
+msgid "Epson Stylus C20"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+#, fuzzy
+msgid "Epson Stylus C20SX"
+msgstr "EPSON Stylus C20SX"
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+#, fuzzy
+msgid "Epson Stylus C20UX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44UX"
+msgid "Epson Stylus C40"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+#, fuzzy
+msgid "Epson Stylus C40SX"
+msgstr "EPSON Stylus C40SX"
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+#, fuzzy
+msgid "Epson Stylus C40UX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C45"
-msgstr "EPSON Stylus C45"
+#, fuzzy
+msgid "Epson Stylus C41"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C46"
-msgstr "EPSON Stylus C46"
+#, fuzzy
+msgid "Epson Stylus C41SX"
+msgstr "EPSON Stylus C41SX"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "EPSON Stylus C48"
-msgstr "EPSON Stylus C45"
+msgid "Epson Stylus C41UX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C50"
-msgstr "EPSON Stylus C50"
+#, fuzzy
+msgid "Epson Stylus C42"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C60"
-msgstr "EPSON Stylus C60"
+#, fuzzy
+msgid "Epson Stylus C42SX"
+msgstr "EPSON Stylus C42SX"
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C61"
-msgstr "EPSON Stylus C61"
+#, fuzzy
+msgid "Epson Stylus C42UX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C62"
-msgstr "EPSON Stylus C62"
+#, fuzzy
+msgid "Epson Stylus C43"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C63"
-msgstr "EPSON Stylus C63"
+#, fuzzy
+msgid "Epson Stylus C43SX"
+msgstr "EPSON Stylus C43SX"
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C64"
-msgstr "EPSON Stylus C64"
+#, fuzzy
+msgid "Epson Stylus C43UX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C65"
-msgstr "EPSON Stylus C65"
+#, fuzzy
+msgid "Epson Stylus C44"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus C66"
-msgstr "EPSON Stylus C66"
+#, fuzzy
+msgid "Epson Stylus C44SX"
+msgstr "EPSON Stylus C44SX"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "EPSON Stylus C68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus C44UX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus C70"
-msgstr "EPSON Stylus C70"
+#, fuzzy
+msgid "Epson Stylus C45"
+msgstr "EPSON Stylus C45"
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus C80"
-msgstr "EPSON Stylus C80"
+#, fuzzy
+msgid "Epson Stylus C46"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus C82"
-msgstr "EPSON Stylus C82"
+#, fuzzy
+msgid "Epson Stylus C48"
+msgstr "EPSON Stylus C45"
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus C83"
-msgstr "EPSON Stylus C83"
+#, fuzzy
+msgid "Epson Stylus C50"
+msgstr "EPSON Stylus C50"
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus C84"
-msgstr "EPSON Stylus C84"
+#, fuzzy
+msgid "Epson Stylus C60"
+msgstr "EPSON Stylus C60"
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus C85"
-msgstr "EPSON Stylus C85"
+#, fuzzy
+msgid "Epson Stylus C61"
+msgstr "EPSON Stylus C61"
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus C86"
-msgstr "EPSON Stylus C86"
+#, fuzzy
+msgid "Epson Stylus C62"
+msgstr "EPSON Stylus C62"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "EPSON Stylus C88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus C63"
+msgstr "EPSON Stylus C63"
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color"
-msgstr "EPSON Stylus Color"
+#, fuzzy
+msgid "Epson Stylus C64"
+msgstr "EPSON Stylus C64"
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color Pro"
-msgstr "EPSON Stylus Color Pro"
+#, fuzzy
+msgid "Epson Stylus C65"
+msgstr "EPSON Stylus C65"
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color Pro XL"
-msgstr "EPSON Stylus Color Pro XL"
+#, fuzzy
+msgid "Epson Stylus C66"
+msgstr "EPSON Stylus C66"
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 400"
-msgstr "EPSON Stylus Color 400"
+#, fuzzy
+msgid "Epson Stylus C68"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 440"
-msgstr "EPSON Stylus Color 440"
+#, fuzzy
+msgid "Epson Stylus C70"
+msgstr "EPSON Stylus C70"
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 460"
-msgstr "EPSON Stylus Color 460"
+#, fuzzy
+msgid "Epson Stylus C80"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 480"
-msgstr "EPSON Stylus Color 480"
+#, fuzzy
+msgid "Epson Stylus C82"
+msgstr "EPSON Stylus C82"
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 500"
-msgstr "EPSON Stylus Color 500"
+#, fuzzy
+msgid "Epson Stylus C83"
+msgstr "EPSON Stylus C83"
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 580"
-msgstr "EPSON Stylus Color 580"
+#, fuzzy
+msgid "Epson Stylus C84"
+msgstr "EPSON Stylus C84"
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 600"
-msgstr "EPSON Stylus Color 600"
+#, fuzzy
+msgid "Epson Stylus C85"
+msgstr "EPSON Stylus C85"
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 640"
-msgstr "EPSON Stylus Color 640"
+#, fuzzy
+msgid "Epson Stylus C86"
+msgstr "EPSON Stylus C86"
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 660"
-msgstr "EPSON Stylus Color 660"
+#, fuzzy
+msgid "Epson Stylus C88"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 670"
-msgstr "EPSON Stylus Color 670"
+#, fuzzy
+msgid "Epson Stylus Color"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 680"
-msgstr "EPSON Stylus Color 680"
+#, fuzzy
+msgid "Epson Stylus Color I"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 740"
-msgstr "EPSON Stylus Color 740"
+#, fuzzy
+msgid "Epson Stylus Color II"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 760"
-msgstr "EPSON Stylus Color 760"
+#, fuzzy
+msgid "Epson Stylus Color IIs"
+msgstr "EPSON Stylus Color"
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 777"
-msgstr "EPSON Stylus Color 777"
+#, fuzzy
+msgid "Epson Stylus Color PRO"
+msgstr "EPSON Stylus Color Pro"
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 800"
-msgstr "EPSON Stylus Color 800"
+#, fuzzy
+msgid "Epson Stylus Pro XL"
+msgstr "EPSON Stylus Color Pro XL"
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Color 850"
-msgstr "EPSON Stylus Color 850"
+#, fuzzy
+msgid "Epson Stylus Color 400"
+msgstr "EPSON Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Color 860"
-msgstr "EPSON Stylus Color 860"
+#, fuzzy
+msgid "Epson Stylus Color 440"
+msgstr "EPSON Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Color 880"
-msgstr "EPSON Stylus Color 880"
+#, fuzzy
+msgid "Epson Stylus Color 460"
+msgstr "EPSON Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Color 83"
-msgstr "EPSON Stylus Color 83"
+#, fuzzy
+msgid "Epson Stylus Color 480"
+msgstr "EPSON Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Color 900"
-msgstr "EPSON Stylus Color 900"
+#, fuzzy
+msgid "Epson Stylus Color 500"
+msgstr "EPSON Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Color 980"
-msgstr "EPSON Stylus Color 980"
+#, fuzzy
+msgid "Epson Stylus Color 580"
+msgstr "EPSON Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Color 1160"
-msgstr "EPSON Stylus Color 1160"
+#, fuzzy
+msgid "Epson Stylus Color 600"
+msgstr "EPSON Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Color 1500"
-msgstr "EPSON Stylus Color 1500"
+#, fuzzy
+msgid "Epson Stylus Color 640"
+msgstr "EPSON Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Color 1520"
-msgstr "EPSON Stylus Color 1520"
+#, fuzzy
+msgid "Epson Stylus Color 660"
+msgstr "EPSON Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Color 3000"
-msgstr "EPSON Stylus Color 3000"
+#, fuzzy
+msgid "Epson Stylus Color 670"
+msgstr "EPSON Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo"
-msgstr "EPSON Stylus Photo"
+#, fuzzy
+msgid "Epson Stylus Color 680"
+msgstr "EPSON Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 700"
-msgstr "EPSON Stylus Photo 700"
+#, fuzzy
+msgid "Epson Stylus Color 740"
+msgstr "EPSON Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo EX"
-msgstr "EPSON Stylus Photo EX"
+#, fuzzy
+msgid "Epson Stylus Color 760"
+msgstr "EPSON Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+#, fuzzy
+msgid "Epson Stylus Color 777"
+msgstr "EPSON Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 720"
-msgstr "EPSON Stylus Photo 720"
+#, fuzzy
+msgid "Epson Stylus Color 800"
+msgstr "EPSON Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 750"
-msgstr "EPSON Stylus Photo 750"
+#, fuzzy
+msgid "Epson Stylus Color 850"
+msgstr "EPSON Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 780"
-msgstr "EPSON Stylus Photo 780"
+#, fuzzy
+msgid "Epson Stylus Color 860"
+msgstr "EPSON Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 785EPX"
-msgstr "EPSON Stylus Photo 785EPX"
+#, fuzzy
+msgid "Epson Stylus Color 880"
+msgstr "EPSON Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 790"
-msgstr "EPSON Stylus Photo 790"
+#, fuzzy
+msgid "Epson Stylus Color 8 3"
+msgstr "EPSON Stylus Color 83"
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 810"
-msgstr "EPSON Stylus Photo 810"
+#, fuzzy
+msgid "Epson Stylus Color 900"
+msgstr "EPSON Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 820"
-msgstr "EPSON Stylus Photo 820"
+#, fuzzy
+msgid "Epson Stylus Color 980"
+msgstr "EPSON Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+#, fuzzy
+msgid "Epson Stylus Color 1160"
+msgstr "EPSON Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 830"
-msgstr "EPSON Stylus Photo 830"
+#, fuzzy
+msgid "Epson Stylus Color 1500"
+msgstr "EPSON Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 870"
-msgstr "EPSON Stylus Photo 870"
+#, fuzzy
+msgid "Epson Stylus Color 1520"
+msgstr "EPSON Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 875"
-msgstr "EPSON Stylus Photo 875"
+#, fuzzy
+msgid "Epson Stylus Color 3000"
+msgstr "EPSON Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 890"
-msgstr "EPSON Stylus Photo 890"
+#, fuzzy
+msgid "Epson Stylus Photo"
+msgstr "EPSON Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 895"
-msgstr "EPSON Stylus Photo 895"
+#, fuzzy
+msgid "Epson Stylus Photo 700"
+msgstr "EPSON Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 900"
-msgstr "EPSON Stylus Photo 900"
+#, fuzzy
+msgid "Epson Stylus Photo EX"
+msgstr "EPSON Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 915"
-msgstr "EPSON Stylus Photo 915"
+#, fuzzy
+msgid "Epson Stylus Photo EX3"
+msgstr "EPSON Stylus Photo EX3"
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 925"
-msgstr "EPSON Stylus Photo 925"
+#, fuzzy
+msgid "Epson Stylus Photo 720"
+msgstr "EPSON Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+#, fuzzy
+msgid "Epson Stylus Photo 750"
+msgstr "EPSON Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo 950"
-msgstr "EPSON Stylus Photo 950"
+#, fuzzy
+msgid "Epson Stylus Photo 780"
+msgstr "EPSON Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo 960"
-msgstr "EPSON Stylus Photo 960"
+#, fuzzy
+msgid "Epson Stylus Photo 785"
+msgstr "EPSON Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo 1200"
-msgstr "EPSON Stylus Photo 1200"
+#, fuzzy
+msgid "Epson Stylus Photo 790"
+msgstr "EPSON Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo 1270"
-msgstr "EPSON Stylus Photo 1270"
+#, fuzzy
+msgid "Epson Stylus Photo 810"
+msgstr "EPSON Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo 1280"
-msgstr "EPSON Stylus Photo 1280"
+#, fuzzy
+msgid "Epson Stylus Photo 820"
+msgstr "EPSON Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo 1290"
-msgstr "EPSON Stylus Photo 1290"
+#, fuzzy
+msgid "Epson Stylus Photo 825"
+msgstr "EPSON Stylus Photo 825"
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo 2000P"
-msgstr "EPSON Stylus Photo 2000P"
+#, fuzzy
+msgid "Epson Stylus Photo 830"
+msgstr "EPSON Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo 2100"
-msgstr "EPSON Stylus Photo 2100"
+#, fuzzy
+msgid "Epson Stylus Photo 830U"
+msgstr "EPSON Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo 2200"
-msgstr "EPSON Stylus Photo 2200"
+#, fuzzy
+msgid "Epson Stylus Photo 870"
+msgstr "EPSON Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+#, fuzzy
+msgid "Epson Stylus Photo 875"
+msgstr "EPSON Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo R210"
-msgstr "EPSON Stylus Photo R210"
+#, fuzzy
+msgid "Epson Stylus Photo 890"
+msgstr "EPSON Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:267
 #, fuzzy
-msgid "EPSON Stylus Photo R220"
-msgstr "EPSON Stylus Photo 2200"
+msgid "Epson Stylus Photo 895"
+msgstr "EPSON Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+#, fuzzy
+msgid "Epson Stylus Photo 900"
+msgstr "EPSON Stylus Photo 900"
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R310"
-msgstr "EPSON Stylus Photo R310"
+#, fuzzy
+msgid "Epson Stylus Photo 915"
+msgstr "EPSON Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:270
 #, fuzzy
-msgid "EPSON Stylus Photo R320"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo 925"
+msgstr "EPSON Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:271
 #, fuzzy
-msgid "EPSON Stylus Photo R340"
-msgstr "EPSON Stylus Photo R300"
+msgid "Epson Stylus Photo 935"
+msgstr "EPSON Stylus Photo 935"
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX400"
+#, fuzzy
+msgid "Epson Stylus Photo 950"
+msgstr "EPSON Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Photo RX420"
-msgstr "EPSON Stylus Photo RX420"
+#, fuzzy
+msgid "Epson Stylus Photo 960"
+msgstr "EPSON Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Photo RX425"
-msgstr "EPSON Stylus Photo RX425"
+#, fuzzy
+msgid "Epson Stylus Photo 1200"
+msgstr "EPSON Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Photo RX430"
-msgstr "EPSON Stylus Photo RX430"
+#, fuzzy
+msgid "Epson Stylus Photo 1270"
+msgstr "EPSON Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+#, fuzzy
+msgid "Epson Stylus Photo 1280"
+msgstr "EPSON Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX510"
+#, fuzzy
+msgid "Epson Stylus Photo 1290"
+msgstr "EPSON Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+#, fuzzy
+msgid "Epson Stylus Photo 2000P"
+msgstr "EPSON Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX620"
+#, fuzzy
+msgid "Epson Stylus Photo 2100"
+msgstr "EPSON Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX630"
+#, fuzzy
+msgid "Epson Stylus Photo 2200"
+msgstr "EPSON Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:281
 #, fuzzy
-msgid "EPSON Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX400"
+msgid "Epson Stylus Photo R200"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+#, fuzzy
+msgid "Epson Stylus Photo R210"
+msgstr "EPSON Stylus Photo R210"
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R1800"
+#, fuzzy
+msgid "Epson Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:284
 #, fuzzy
-msgid "EPSON Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo R300"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus Pro 5000"
-msgstr "EPSON Stylus Pro 5000"
+#, fuzzy
+msgid "Epson Stylus Photo R310"
+msgstr "EPSON Stylus Photo R310"
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus Pro 5500"
-msgstr "EPSON Stylus Pro 5500"
+#, fuzzy
+msgid "Epson Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus Pro 7000"
-msgstr "EPSON Stylus Pro 7000"
+#, fuzzy
+msgid "Epson Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus Pro 7500"
-msgstr "EPSON Stylus Pro 7500"
+#, fuzzy
+msgid "Epson Stylus Photo RX400"
+msgstr "EPSON Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus Pro 7600"
-msgstr "EPSON Stylus Pro 7600"
+#, fuzzy
+msgid "Epson Stylus Photo RX420"
+msgstr "EPSON Stylus Photo RX420"
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus Pro 9000"
-msgstr "EPSON Stylus Pro 9000"
+#, fuzzy
+msgid "Epson Stylus Photo RX425"
+msgstr "EPSON Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus Pro 9500"
-msgstr "EPSON Stylus Pro 9500"
+#, fuzzy
+msgid "Epson Stylus Photo RX430"
+msgstr "EPSON Stylus Photo RX430"
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus Pro 9600"
-msgstr "EPSON Stylus Pro 9600"
+#, fuzzy
+msgid "Epson Stylus Photo RX500"
+msgstr "EPSON Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus Pro 10000"
-msgstr "EPSON Stylus Pro 10000"
+#, fuzzy
+msgid "Epson Stylus Photo RX510"
+msgstr "EPSON Stylus Photo RX510"
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus Scan 2000"
-msgstr "EPSON Stylus Scan 2000"
+#, fuzzy
+msgid "Epson Stylus Photo RX600"
+msgstr "EPSON Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus Scan 2500"
-msgstr "EPSON Stylus Scan 2500"
+#, fuzzy
+msgid "Epson Stylus Photo RX620"
+msgstr "EPSON Stylus Photo RX620"
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX1500"
-msgstr "EPSON Stylus CX1500"
+#, fuzzy
+msgid "Epson Stylus Photo RX630"
+msgstr "EPSON Stylus Photo RX630"
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX3100"
-msgstr "EPSON Stylus CX3100"
+#, fuzzy
+msgid "Epson Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON Stylus CX3200"
-msgstr "EPSON Stylus CX3200"
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "EPSON Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON Stylus CX3500"
-msgstr "EPSON Stylus CX3500"
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "EPSON Stylus Photo R1800"
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON Stylus CX3600"
-msgstr "EPSON Stylus CX3600"
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON Stylus CX3650"
-msgstr "EPSON Stylus CX3650"
+#, fuzzy
+msgid "Epson Stylus Pro 5000"
+msgstr "EPSON Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
-msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX8300"
+msgid "Epson Stylus Pro 5500"
+msgstr "EPSON Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
-msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 7000"
+msgstr "EPSON Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
-msgid "EPSON Stylus CX3805"
-msgstr "EPSON Stylus C85"
+msgid "Epson Stylus Pro 7500"
+msgstr "EPSON Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:305
 #, fuzzy
-msgid "EPSON Stylus CX3810"
-msgstr "EPSON Stylus CX3100"
+msgid "Epson Stylus Pro 7600"
+msgstr "EPSON Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "EPSON Stylus CX4100"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9000"
+msgstr "EPSON Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9500"
+msgstr "EPSON Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:308
 #, fuzzy
-msgid "EPSON Stylus CX4500"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Pro 9600"
+msgstr "EPSON Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX4600"
-msgstr "EPSON Stylus CX4600"
+#, fuzzy
+msgid "Epson Stylus Pro 10000"
+msgstr "EPSON Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:310
 #, fuzzy
-msgid "EPSON Stylus CX4700"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Scan 2000"
+msgstr "EPSON Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:311
 #, fuzzy
-msgid "EPSON Stylus CX4800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus Scan 2500"
+msgstr "EPSON Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5100"
-msgstr "EPSON Stylus CX5100"
+#, fuzzy
+msgid "Epson Stylus CX1500"
+msgstr "EPSON Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5200"
-msgstr "EPSON Stylus CX5200"
+#, fuzzy
+msgid "Epson Stylus CX3100"
+msgstr "EPSON Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX5300"
-msgstr "EPSON Stylus CX5300"
+#, fuzzy
+msgid "Epson Stylus CX3200"
+msgstr "EPSON Stylus CX3200"
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX5400"
-msgstr "EPSON Stylus CX5400"
+#, fuzzy
+msgid "Epson Stylus CX3500"
+msgstr "EPSON Stylus CX3500"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "EPSON Stylus CX5700"
-msgstr "EPSON Stylus CX6500"
+msgid "Epson Stylus CX3600"
+msgstr "EPSON Stylus CX3600"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX8400"
+msgid "Epson Stylus CX3650"
+msgstr "EPSON Stylus CX3650"
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX6300"
-msgstr "EPSON Stylus CX6300"
+#, fuzzy
+msgid "Epson Stylus CX3700"
+msgstr "EPSON Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX6400"
-msgstr "EPSON Stylus CX6400"
+#, fuzzy
+msgid "Epson Stylus CX3800"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX6500"
-msgstr "EPSON Stylus CX6500"
+#, fuzzy
+msgid "Epson Stylus CX3805"
+msgstr "EPSON Stylus C85"
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX6600"
-msgstr "EPSON Stylus CX6600"
+#, fuzzy
+msgid "Epson Stylus CX3810"
+msgstr "EPSON Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:322
 #, fuzzy
-msgid "EPSON Stylus CX7700"
-msgstr "EPSON Stylus C70"
+msgid "Epson Stylus CX4100"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:323
 #, fuzzy
-msgid "EPSON Stylus CX7800"
+msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus CX8300"
-msgstr "EPSON Stylus CX8300"
+#, fuzzy
+msgid "Epson Stylus CX4500"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus CX8400"
-msgstr "EPSON Stylus CX8400"
+#, fuzzy
+msgid "Epson Stylus CX4600"
+msgstr "EPSON Stylus CX4600"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "EPSON Stylus D68"
-msgstr "EPSON Stylus C46"
+msgid "Epson Stylus CX4700"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "EPSON Stylus D88"
-msgstr "EPSON Stylus C80"
+msgid "Epson Stylus CX4800"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:328
 #, fuzzy
-msgid "EPSON Stylus DX3800"
-msgstr "EPSON Stylus CX3100"
+msgid "Epson Stylus CX5100"
+msgstr "EPSON Stylus CX5100"
 
 #: src/main/xmli18n-tmp.h:329
 #, fuzzy
-msgid "EPSON Stylus DX3850"
-msgstr "EPSON Stylus CX3500"
+msgid "Epson Stylus CX5200"
+msgstr "EPSON Stylus CX5200"
 
 #: src/main/xmli18n-tmp.h:330
 #, fuzzy
-msgid "EPSON Stylus DX4200"
-msgstr "EPSON Stylus CX3200"
+msgid "Epson Stylus CX5300"
+msgstr "EPSON Stylus CX5300"
 
 #: src/main/xmli18n-tmp.h:331
 #, fuzzy
-msgid "EPSON Stylus DX4250"
-msgstr "EPSON Stylus C50"
+msgid "Epson Stylus CX5400"
+msgstr "EPSON Stylus CX5400"
 
 #: src/main/xmli18n-tmp.h:332
 #, fuzzy
-msgid "EPSON Stylus DX4800"
-msgstr "EPSON Stylus CX4600"
+msgid "Epson Stylus CX5700"
+msgstr "EPSON Stylus CX6500"
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PictureMate"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5800"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PictureMate Deluxe"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6300"
+msgstr "EPSON Stylus CX6300"
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON CL-700"
-msgstr "EPSON CL-700"
+#, fuzzy
+msgid "Epson Stylus CX6400"
+msgstr "EPSON Stylus CX6400"
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON CL-750"
-msgstr "EPSON CL-750"
+#, fuzzy
+msgid "Epson Stylus CX6500"
+msgstr "EPSON Stylus CX6500"
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON CL-760"
-msgstr "EPSON CL-760"
+#, fuzzy
+msgid "Epson Stylus CX6600"
+msgstr "EPSON Stylus CX6600"
 
 #: src/main/xmli18n-tmp.h:338
 #, fuzzy
-msgid "EPSON E-100"
-msgstr "EPSON EM-900C"
+msgid "Epson Stylus CX7700"
+msgstr "EPSON Stylus C70"
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON EM-900C"
-msgstr "EPSON EM-900C"
+#, fuzzy
+msgid "Epson Stylus CX7800"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON EM-930C"
-msgstr "EPSON EM-930C"
+#, fuzzy
+msgid "Epson Stylus CX8300"
+msgstr "EPSON Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MC-2000"
-msgstr "EPSON MC-2000"
+#, fuzzy
+msgid "Epson Stylus CX8400"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON MC-5000"
-msgstr "EPSON MC-5000"
+#, fuzzy
+msgid "Epson Stylus D68"
+msgstr "EPSON Stylus C46"
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON MC-7000"
-msgstr "EPSON MC-7000"
+#, fuzzy
+msgid "Epson Stylus D88"
+msgstr "EPSON Stylus C80"
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON MC-9000"
-msgstr "EPSON MC-9000"
+#, fuzzy
+msgid "Epson Stylus DX3800"
+msgstr "EPSON Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON MC-10000"
-msgstr "EPSON MC-10000"
+#, fuzzy
+msgid "Epson Stylus DX3850"
+msgstr "EPSON Stylus CX3500"
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON MJ-930C"
-msgstr "EPSON MJ-930C"
+#, fuzzy
+msgid "Epson Stylus DX4200"
+msgstr "EPSON Stylus CX3200"
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON MJ-5100C"
-msgstr "EPSON MJ-5100C"
+#, fuzzy
+msgid "Epson Stylus DX4250"
+msgstr "EPSON Stylus C50"
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON MJ-6000C"
-msgstr "EPSON MJ-6000C"
+#, fuzzy
+msgid "Epson Stylus DX4800"
+msgstr "EPSON Stylus CX4600"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON MJ-8000C"
-msgstr "EPSON MJ-8000C"
+msgid "Epson PictureMate"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-700C"
-msgstr "EPSON PM-700C"
+msgid "Epson PictureMate Deluxe"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-730C"
-msgstr "EPSON PM-730C"
+#, fuzzy
+msgid "Epson CL 700"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-740C"
-msgstr "EPSON PM-740C"
+msgid "Epson CL 750"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-750C"
-msgstr "EPSON PM-750C"
+msgid "Epson CL 760"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-760C"
-msgstr "EPSON PM-760C"
+msgid "Epson E 100"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-770C"
-msgstr "EPSON PM-770C"
+msgid "Epson E 150"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-780C"
-msgstr "EPSON PM-780C"
+msgid "Epson E 200"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-790PT"
-msgstr "EPSON PM-790PT"
+#, fuzzy
+msgid "Epson EM 900C"
+msgstr "EPSON EM-900C"
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-800C"
-msgstr "EPSON PM-800C"
+#, fuzzy
+msgid "Epson EM 930C"
+msgstr "EPSON EM-930C"
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-850PT"
-msgstr "EPSON PM-850PT"
+#, fuzzy
+msgid "Epson MC 2000"
+msgstr "Canon BJC 2000"
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-870C"
-msgstr "EPSON PM-870C"
+#, fuzzy
+msgid "Epson MC 5000"
+msgstr "EPSON MC-5000"
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-880C"
-msgstr "EPSON PM-880C"
+#, fuzzy
+msgid "Epson MC 7000"
+msgstr "Canon BJC 7000"
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-930C"
-msgstr "EPSON PM-930C"
+#, fuzzy
+msgid "Epson MC 9000"
+msgstr "EPSON MC-9000"
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-940C"
-msgstr "EPSON PM-940C"
+#, fuzzy
+msgid "Epson MC 10000"
+msgstr "Canon BJC 1000"
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-950C"
-msgstr "EPSON PM-950C"
+#, fuzzy
+msgid "Epson MJ 930C"
+msgstr "EPSON MJ-930C"
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-970C"
-msgstr "EPSON PM-970C"
+#, fuzzy
+msgid "Epson MJ 5100C"
+msgstr "EPSON MJ-5100C"
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-980C"
-msgstr "EPSON PM-980C"
+#, fuzzy
+msgid "Epson MJ 6000C"
+msgstr "Canon BJC 6000"
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-2000C"
-msgstr "EPSON PM-2000C"
+#, fuzzy
+msgid "Epson MJ 8000C"
+msgstr "EPSON MJ-8000C"
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-2200C"
-msgstr "EPSON PM-2200C"
+#, fuzzy
+msgid "Epson PM 700C"
+msgstr "EPSON PM-700C"
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-3000C"
-msgstr "EPSON PM-3000C"
+#, fuzzy
+msgid "Epson PM 730C"
+msgstr "EPSON PM-730C"
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-3300C"
-msgstr "EPSON PM-3300C"
+#, fuzzy
+msgid "Epson PM 740C"
+msgstr "EPSON PM-740C"
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-3500C"
-msgstr "EPSON PM-3500C"
+#, fuzzy
+msgid "Epson PM 750C"
+msgstr "EPSON PM-750C"
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-3700C"
-msgstr "EPSON PM-3700C"
+#, fuzzy
+msgid "Epson PM 760C"
+msgstr "EPSON PM-760C"
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-4000PX"
-msgstr "EPSON PM-4000PX"
+#, fuzzy
+msgid "Epson PM 770C"
+msgstr "EPSON PM-770C"
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-5000C"
-msgstr "EPSON PM-5000C"
+#, fuzzy
+msgid "Epson PM 780C"
+msgstr "EPSON PM-780C"
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-7000C"
-msgstr "EPSON PM-7000C"
+#, fuzzy
+msgid "Epson PM 790PT"
+msgstr "EPSON PM-790PT"
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-9000C"
-msgstr "EPSON PM-9000C"
+#, fuzzy
+msgid "Epson PM 800C"
+msgstr "EPSON PM-800C"
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PM-10000"
-msgstr "EPSON PM-10000"
+#, fuzzy
+msgid "Epson PM 850PT"
+msgstr "EPSON PM-850PT"
 
 #: src/main/xmli18n-tmp.h:378
 #, fuzzy
-msgid "EPSON PM-A900"
-msgstr "EPSON PM-9000C"
+msgid "Epson PM 870C"
+msgstr "EPSON PM-870C"
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PM-D750"
-msgstr "EPSON PM-D750"
+#, fuzzy
+msgid "Epson PM 880C"
+msgstr "EPSON PM-880C"
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PM-D770"
-msgstr "EPSON PM-D770"
+#, fuzzy
+msgid "Epson PM 930C"
+msgstr "EPSON PM-930C"
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PM-D1000"
-msgstr "EPSON PM-D1000"
+#, fuzzy
+msgid "Epson PM 940C"
+msgstr "EPSON PM-940C"
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PM-G700"
-msgstr "EPSON PM-G700"
+#, fuzzy
+msgid "Epson PM 950C"
+msgstr "EPSON PM-950C"
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PM-G720"
-msgstr "EPSON PM-G720"
+#, fuzzy
+msgid "Epson PM 970C"
+msgstr "EPSON PM-970C"
 
 #: src/main/xmli18n-tmp.h:384
-msgid "EPSON PM-G800"
-msgstr "EPSON PM-G800"
+#, fuzzy
+msgid "Epson PM 980C"
+msgstr "EPSON PM-980C"
 
 #: src/main/xmli18n-tmp.h:385
-msgid "EPSON PM-G820"
-msgstr "EPSON PM-G820"
+#, fuzzy
+msgid "Epson PM 2000C"
+msgstr "EPSON PM-2000C"
 
 #: src/main/xmli18n-tmp.h:386
 #, fuzzy
-msgid "EPSON PX-A650"
-msgstr "EPSON PX-V600"
+msgid "Epson PM 2200C"
+msgstr "EPSON PM-2200C"
 
 #: src/main/xmli18n-tmp.h:387
-msgid "EPSON PX-G900"
-msgstr "EPSON PX-G900"
+#, fuzzy
+msgid "Epson PM 3000C"
+msgstr "EPSON PM-3000C"
 
 #: src/main/xmli18n-tmp.h:388
-msgid "EPSON PX-G920"
-msgstr "EPSON PX-G920"
+#, fuzzy
+msgid "Epson PM 3300C"
+msgstr "EPSON PM-3300C"
 
 #: src/main/xmli18n-tmp.h:389
-msgid "EPSON PX-G5000"
-msgstr "EPSON PX-G5000"
+#, fuzzy
+msgid "Epson PM 3500C"
+msgstr "EPSON PM-3500C"
 
 #: src/main/xmli18n-tmp.h:390
-msgid "EPSON PX-V500"
-msgstr "EPSON PX-V500"
+#, fuzzy
+msgid "Epson PM 3700C"
+msgstr "EPSON PM-3700C"
 
 #: src/main/xmli18n-tmp.h:391
-msgid "EPSON PX-V600"
-msgstr "EPSON PX-V600"
+#, fuzzy
+msgid "Epson PM 4000PX"
+msgstr "EPSON PM-4000PX"
 
 #: src/main/xmli18n-tmp.h:392
 #, fuzzy
-msgid "EPSON PX-5500"
-msgstr "EPSON PX-V500"
+msgid "Epson PM 5000C"
+msgstr "EPSON PM-5000C"
 
 #: src/main/xmli18n-tmp.h:393
-msgid "EPSON PX-7000"
-msgstr "EPSON PX-7000"
+#, fuzzy
+msgid "Epson PM 7000C"
+msgstr "EPSON PM-7000C"
 
 #: src/main/xmli18n-tmp.h:394
-msgid "EPSON PX-9000"
-msgstr "EPSON PX-9000"
+#, fuzzy
+msgid "Epson PM 9000C"
+msgstr "EPSON PM-9000C"
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Apple Color StyleWriter 4100"
-msgstr "Apple Color StyleWriter 4100"
+#, fuzzy
+msgid "Epson PM 10000"
+msgstr "EPSON PM-10000"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Apple Color StyleWriter 4500"
-msgstr "Apple Color StyleWriter 4500"
+msgid "Epson PM A650"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Apple Color StyleWriter 6500"
-msgstr "Apple Color StyleWriter 6500"
+msgid "Epson PM A750"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DeskJet 340"
-msgstr "HP DeskJet 340"
+msgid "Epson PM A890"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DeskJet 400"
-msgstr "HP DeskJet 400"
+#, fuzzy
+msgid "Epson PM A900"
+msgstr "EPSON PM-9000C"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500"
-msgstr "HP DeskJet 500"
+msgid "Epson PM A950"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DesignJet 230"
-msgstr "HP DesignJet 230"
+msgid "Epson PM D600"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DesignJet 250C"
-msgstr "HP DesignJet 250C"
+#, fuzzy
+msgid "Epson PM D750"
+msgstr "EPSON PM-D750"
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DesignJet 700"
-msgstr "HP DesignJet 700"
+#, fuzzy
+msgid "Epson PM D770"
+msgstr "EPSON PM-D770"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DesignJet 750C"
-msgstr "HP DesignJet 750C"
+msgid "Epson PM D800"
+msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DesignJet 2500C"
-msgstr "HP DesignJet 2500C"
+#, fuzzy
+msgid "Epson PM D1000"
+msgstr "EPSON PM-D1000"
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DesignJet 3500C"
-msgstr "HP DesignJet 3500C"
+#, fuzzy
+msgid "Epson PM G700"
+msgstr "EPSON PM-G700"
 
 #: src/main/xmli18n-tmp.h:407
+#, fuzzy
+msgid "Epson PM G720"
+msgstr "EPSON PM-G720"
+
+#: src/main/xmli18n-tmp.h:408
+msgid "Epson PM G730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:409
+#, fuzzy
+msgid "Epson PM G800"
+msgstr "EPSON PM-G800"
+
+#: src/main/xmli18n-tmp.h:410
+#, fuzzy
+msgid "Epson PM G820"
+msgstr "EPSON PM-G820"
+
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson PX A650"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:412
+#, fuzzy
+msgid "Epson PX G900"
+msgstr "EPSON PX-G900"
+
+#: src/main/xmli18n-tmp.h:413
+#, fuzzy
+msgid "Epson PX G920"
+msgstr "EPSON PX-G920"
+
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson PX G5000"
+msgstr "EPSON PX-G5000"
+
+#: src/main/xmli18n-tmp.h:415
+#, fuzzy
+msgid "Epson PX V500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:416
+#, fuzzy
+msgid "Epson PX V600"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:417
+msgid "Epson PX V630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:418
+#, fuzzy
+msgid "Epson PX 5500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:419
+#, fuzzy
+msgid "Epson PX 7000"
+msgstr "EPSON PX-7000"
+
+#: src/main/xmli18n-tmp.h:420
+#, fuzzy
+msgid "Epson PX 9000"
+msgstr "EPSON PX-9000"
+
+#: src/main/xmli18n-tmp.h:421
+msgid "Apollo P-2100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:422
+msgid "Apollo P-2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:423
+msgid "Apollo P-2200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:424
+msgid "Apollo P-2250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:425
+msgid "Apollo P-2500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:426
+msgid "Apollo P-2550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:427
+msgid "Apollo P-2600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:428
+msgid "Apollo P-2650"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:429
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/main/xmli18n-tmp.h:430
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/main/xmli18n-tmp.h:431
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/main/xmli18n-tmp.h:432
+msgid "Apple LaserWriter Select 360"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:433
+msgid "Brother DCP-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:434
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:435
+msgid "Brother HL-10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:436
+msgid "Brother HL-10h"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:437
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Brother HL-1040"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Brother HL-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Brother HL-1060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Brother HL-1070"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Brother HL-1240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Brother HL-1250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Brother HL-1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Brother HL-1270N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Brother HL-1440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Brother HL-1660e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Brother HL-2060"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Brother MFC-6550MC"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Brother MFC-8300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:454
+msgid "Brother MFC-9500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
+msgid "Brother MFC-9600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:456
+#, fuzzy
+msgid "Canon GP 335"
+msgstr "Canon BJC 85"
+
+#: src/main/xmli18n-tmp.h:457
+#, fuzzy
+msgid "Canon LBP-4sx"
+msgstr "Canon BJC 240"
+
+#: src/main/xmli18n-tmp.h:458
+#, fuzzy
+msgid "Canon LBP-430"
+msgstr "Canon BJC 4300"
+
+#: src/main/xmli18n-tmp.h:459
+#, fuzzy
+msgid "Canon LBP-1000"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:460
+#, fuzzy
+msgid "Canon LBP-1260"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:461
+#, fuzzy
+msgid "Canon LBP-1760"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Canon imageRunner 330s"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Citizen ProJet II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:464
+msgid "DEC 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:465
+msgid "DEC LN17"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:466
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:468
+msgid "Epson AcuLaser C2000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson AcuLaser C2000PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson AcuLaser C8500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson AcuLaser C8500PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:472
+msgid "Epson AcuLaser C8600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:473
+msgid "Epson AcuLaser C8600PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:474
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:475
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:476
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:477
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:478
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:479
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:480
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:481
+msgid "Epson EPL-5900PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:482
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:483
+msgid "Epson EPL-6100PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:484
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:485
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:486
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:487
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:488
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:489
+#, fuzzy
+msgid "Generic PCL 4 Printer"
+msgstr "定義新的�表機"
+
+#: src/main/xmli18n-tmp.h:490
+#, fuzzy
+msgid "Generic PCL 5 Printer"
+msgstr "定義新的�表機"
+
+#: src/main/xmli18n-tmp.h:491
+#, fuzzy
+msgid "Generic PCL 5c Printer"
+msgstr "定義新的�表機"
+
+#: src/main/xmli18n-tmp.h:492
+#, fuzzy
+msgid "Generic PCL 5e Printer"
+msgstr "定義新的�表機"
+
+#: src/main/xmli18n-tmp.h:493
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:494
+#, fuzzy
+msgid "HP Business Inkjet 2200"
+msgstr "HP DeskJet 1200C"
+
+#: src/main/xmli18n-tmp.h:495
+#, fuzzy
+msgid "HP Business Inkjet 2230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:496
+#, fuzzy
+msgid "HP Business Inkjet 2250"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:497
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:498
+#, fuzzy
+msgid "HP Business Inkjet 2280"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:499
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:500
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:501
+#, fuzzy
+msgid "HP Color LaserJet 2500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:502
+#, fuzzy
+msgid "HP Color LaserJet 4500"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "HP Color LaserJet 4550"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:504
+#, fuzzy
+msgid "HP Color LaserJet 4600"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:505
+#, fuzzy
+msgid "HP Color LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:506
+#, fuzzy
+msgid "HP Color LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:507
+#, fuzzy
+msgid "HP Color LaserJet 5500"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:508
+#, fuzzy
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:509
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:510
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:511
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:512
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:513
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:514
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:515
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:516
+#, fuzzy
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:517
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/main/xmli18n-tmp.h:518
+#, fuzzy
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500C"
+
+#: src/main/xmli18n-tmp.h:519
+#, fuzzy
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500C"
+
+#: src/main/xmli18n-tmp.h:520
+#, fuzzy
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet 455CA"
+
+#: src/main/xmli18n-tmp.h:521
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:522
+#, fuzzy
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:523
+#, fuzzy
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:524
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:525
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:526
+#, fuzzy
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:527
+#, fuzzy
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:528
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:529
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:530
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:531
+#, fuzzy
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:532
+#, fuzzy
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:533
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 600/600C"
-msgstr "HP DeskJet 600/600C"
+#: src/main/xmli18n-tmp.h:534
+#, fuzzy
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 600 series"
-msgstr "HP DeskJet 600 系列"
+#: src/main/xmli18n-tmp.h:535
+#, fuzzy
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 690 series"
-msgstr "HP DeskJet 690 系列"
+#: src/main/xmli18n-tmp.h:536
+#, fuzzy
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:537
+#, fuzzy
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:538
+#, fuzzy
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 1220C"
+
+#: src/main/xmli18n-tmp.h:539
+#, fuzzy
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:540
+#, fuzzy
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:541
+#, fuzzy
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:542
+#, fuzzy
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:543
+#, fuzzy
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:544
+#, fuzzy
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:545
+#, fuzzy
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:546
+#, fuzzy
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:547
+#, fuzzy
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:548
+#, fuzzy
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:549
+#, fuzzy
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:550
+#, fuzzy
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:551
+#, fuzzy
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:552
+#, fuzzy
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:553
+#, fuzzy
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:554
+#, fuzzy
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:555
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:556
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:557
+#, fuzzy
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:558
+#, fuzzy
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:559
+#, fuzzy
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:560
+#, fuzzy
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:561
+#, fuzzy
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:562
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:563
+#, fuzzy
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:564
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:565
+#, fuzzy
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 840C"
+
+#: src/main/xmli18n-tmp.h:566
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:567
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:568
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:570
+#, fuzzy
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:571
+#, fuzzy
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:429
-msgid "HP DeskJet 900 series"
-msgstr "HP DeskJet 900 系列"
+#: src/main/xmli18n-tmp.h:574
+#, fuzzy
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:575
+#, fuzzy
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:576
+#, fuzzy
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:577
+#, fuzzy
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:578
+#, fuzzy
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:579
+#, fuzzy
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:580
+#, fuzzy
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:581
+#, fuzzy
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:582
+#, fuzzy
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:583
+#, fuzzy
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 540C"
+
+#: src/main/xmli18n-tmp.h:584
+#, fuzzy
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 500C"
+
+#: src/main/xmli18n-tmp.h:585
+#, fuzzy
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:586
+#, fuzzy
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:587
+#, fuzzy
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:588
+#, fuzzy
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:589
+#, fuzzy
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:590
+#, fuzzy
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:591
+#, fuzzy
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:592
+#, fuzzy
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:593
+#, fuzzy
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:594
+#, fuzzy
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:597
+#, fuzzy
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:435
-msgid "HP DeskJet 2000 series"
-msgstr "HP DeskJet 2000 系列"
+#: src/main/xmli18n-tmp.h:601
+#, fuzzy
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:436
-msgid "HP DeskJet 2500 series"
-msgstr "HP DeskJet 2500 系列"
+#: src/main/xmli18n-tmp.h:602
+#, fuzzy
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:437
-msgid "HP PhotoSmart P1000"
-msgstr "HP PhotoSmart P1000"
+#: src/main/xmli18n-tmp.h:603
+#, fuzzy
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:438
-msgid "HP PhotoSmart P1100"
-msgstr "HP PhotoSmart P1100"
+#: src/main/xmli18n-tmp.h:604
+#, fuzzy
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:439
-msgid "HP LaserJet II series"
-msgstr "HP LaserJet II 系列"
+#: src/main/xmli18n-tmp.h:605
+#, fuzzy
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:440
-msgid "HP LaserJet IIP series"
+#: src/main/xmli18n-tmp.h:606
+#, fuzzy
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:607
+#, fuzzy
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:608
+#, fuzzy
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:609
+#, fuzzy
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:610
+#, fuzzy
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:611
+#, fuzzy
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:612
+#, fuzzy
+msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:441
-msgid "HP LaserJet III series"
-msgstr "HP LaserJet III 系列"
+#: src/main/xmli18n-tmp.h:613
+#, fuzzy
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:442
-msgid "HP LaserJet 4 series"
-msgstr "HP LaserJet 4 系列"
+#: src/main/xmli18n-tmp.h:614
+#, fuzzy
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:443
-msgid "HP LaserJet 4L"
+#: src/main/xmli18n-tmp.h:615
+#, fuzzy
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:616
+#, fuzzy
+msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:444
-msgid "HP LaserJet 4V"
+#: src/main/xmli18n-tmp.h:617
+#, fuzzy
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:618
+#, fuzzy
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:619
+#, fuzzy
+msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:620
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:621
+#, fuzzy
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:622
+#, fuzzy
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:623
+#, fuzzy
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:624
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:446
-msgid "HP LaserJet 5 series"
-msgstr "HP LaserJet 5 系列"
+#: src/main/xmli18n-tmp.h:625
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:626
+#, fuzzy
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:627
+#, fuzzy
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:628
+#, fuzzy
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:629
+#, fuzzy
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:630
+#, fuzzy
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:631
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:448
-msgid "HP LaserJet 6 series"
-msgstr "HP LaserJet 6 系列"
+#: src/main/xmli18n-tmp.h:632
+#, fuzzy
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:633
+#, fuzzy
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:634
+#, fuzzy
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:635
+#, fuzzy
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:636
+#, fuzzy
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:637
+#, fuzzy
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:638
+#, fuzzy
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:639
+#, fuzzy
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:640
+#, fuzzy
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:641
+#, fuzzy
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:642
+#, fuzzy
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:643
+#, fuzzy
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:644
+#, fuzzy
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:645
+#, fuzzy
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:646
+#, fuzzy
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:647
+#, fuzzy
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:648
+#, fuzzy
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:649
+#, fuzzy
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:650
+#, fuzzy
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 4V"
+
+#: src/main/xmli18n-tmp.h:651
+#, fuzzy
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:652
+#, fuzzy
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:653
+#, fuzzy
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:654
+#, fuzzy
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:655
+#, fuzzy
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:656
+#, fuzzy
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:657
+#, fuzzy
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:658
+#, fuzzy
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:659
+#, fuzzy
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:660
+#, fuzzy
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:661
+#, fuzzy
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:662
+#, fuzzy
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:663
+#, fuzzy
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:664
+#, fuzzy
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:665
+#, fuzzy
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:666
+#, fuzzy
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 5Si"
+
+#: src/main/xmli18n-tmp.h:667
+#, fuzzy
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:668
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:669
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:670
+#, fuzzy
+msgid "HP OfficeJet 300"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:671
+#, fuzzy
+msgid "HP OfficeJet 330"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:672
+#, fuzzy
+msgid "HP OfficeJet 350"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:673
+#, fuzzy
+msgid "HP OfficeJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/main/xmli18n-tmp.h:674
+#, fuzzy
+msgid "HP OfficeJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:675
+#, fuzzy
+msgid "HP OfficeJet 570"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:676
+#, fuzzy
+msgid "HP OfficeJet 580"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:677
+#, fuzzy
+msgid "HP OfficeJet 590"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:678
+#, fuzzy
+msgid "HP OfficeJet 600"
+msgstr "HP DeskJet 1600C"
+
+#: src/main/xmli18n-tmp.h:679
+#, fuzzy
+msgid "HP OfficeJet 610"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:680
+#, fuzzy
+msgid "HP OfficeJet 625"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:681
+#, fuzzy
+msgid "HP OfficeJet 630"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:682
+#, fuzzy
+msgid "HP OfficeJet 635"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:683
+#, fuzzy
+msgid "HP OfficeJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/main/xmli18n-tmp.h:684
+#, fuzzy
+msgid "HP OfficeJet 710"
+msgstr "HP DeskJet 870C"
+
+#: src/main/xmli18n-tmp.h:685
+#, fuzzy
+msgid "HP OfficeJet 720"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:686
+#, fuzzy
+msgid "HP OfficeJet 725"
+msgstr "HP DesignJet 250C"
+
+#: src/main/xmli18n-tmp.h:687
+#, fuzzy
+msgid "HP OfficeJet 5105"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:688
+#, fuzzy
+msgid "HP OfficeJet 5110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:689
+#, fuzzy
+msgid "HP OfficeJet 5110xi"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:690
+#, fuzzy
+msgid "HP OfficeJet 6105"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:691
+#, fuzzy
+msgid "HP OfficeJet 6110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:692
+#, fuzzy
+msgid "HP OfficeJet 7110"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:693
+#, fuzzy
+msgid "HP OfficeJet 7130"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:694
+#, fuzzy
+msgid "HP OfficeJet 7140"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:695
+#, fuzzy
+msgid "HP OfficeJet D125"
+msgstr "HP DeskJet 812C"
+
+#: src/main/xmli18n-tmp.h:696
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:697
+#, fuzzy
+msgid "HP OfficeJet D145"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:698
+#, fuzzy
+msgid "HP OfficeJet D155"
+msgstr "HP DeskJet 550C"
+
+#: src/main/xmli18n-tmp.h:699
+#, fuzzy
+msgid "HP OfficeJet G55"
+msgstr "HP DeskJet 855C"
+
+#: src/main/xmli18n-tmp.h:700
+#, fuzzy
+msgid "HP OfficeJet G85"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:701
+#, fuzzy
+msgid "HP OfficeJet G95"
+msgstr "HP DeskJet 895C"
+
+#: src/main/xmli18n-tmp.h:702
+#, fuzzy
+msgid "HP OfficeJet K60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:703
+#, fuzzy
+msgid "HP OfficeJet K60xi"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:704
+#, fuzzy
+msgid "HP OfficeJet K80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:705
+#, fuzzy
+msgid "HP OfficeJet K80xi"
+msgstr "HP DeskJet 810C"
+
+#: src/main/xmli18n-tmp.h:706
+#, fuzzy
+msgid "HP OfficeJet LX"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:707
+#, fuzzy
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:708
+#, fuzzy
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP DeskJet 1120C"
+
+#: src/main/xmli18n-tmp.h:709
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:710
+#, fuzzy
+msgid "HP OfficeJet R40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:711
+#, fuzzy
+msgid "HP OfficeJet R45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:712
+#, fuzzy
+msgid "HP OfficeJet R60"
+msgstr "HP DeskJet 560C"
+
+#: src/main/xmli18n-tmp.h:713
+#, fuzzy
+msgid "HP OfficeJet R65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:714
+#, fuzzy
+msgid "HP OfficeJet R80"
+msgstr "HP DeskJet 890C"
+
+#: src/main/xmli18n-tmp.h:715
+#, fuzzy
+msgid "HP OfficeJet T45"
+msgstr "HP DeskJet 845C"
+
+#: src/main/xmli18n-tmp.h:716
+#, fuzzy
+msgid "HP OfficeJet T65"
+msgstr "HP DeskJet 520"
+
+#: src/main/xmli18n-tmp.h:717
+#, fuzzy
+msgid "HP OfficeJet V40"
+msgstr "HP DeskJet 400"
+
+#: src/main/xmli18n-tmp.h:718
+#, fuzzy
+msgid "HP OfficeJet V40xi"
+msgstr "HP DeskJet 340"
+
+#: src/main/xmli18n-tmp.h:719
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:720
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:721
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:722
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:723
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:724
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:725
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
+#, fuzzy
+msgid "HP PSC 2110"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:727
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:728
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:729
+#, fuzzy
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:730
+#, fuzzy
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:731
+#, fuzzy
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:732
+#, fuzzy
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:733
+#, fuzzy
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:734
+#, fuzzy
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:735
+#, fuzzy
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:736
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/main/xmli18n-tmp.h:737
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:738
+#, fuzzy
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:739
+#, fuzzy
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:740
+#, fuzzy
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:741
+#, fuzzy
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1100"
+
+#: src/main/xmli18n-tmp.h:742
+#, fuzzy
+msgid "HP e-printer e20"
+msgstr "HP DesignJet 230"
+
+#: src/main/xmli18n-tmp.h:743
+msgid "IBM 4019"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:744
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:745
+msgid "IBM 4312"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:746
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:747
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:748
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:749
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:750
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:751
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:752
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:753
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:754
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:755
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:756
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:757
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:758
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:759
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:760
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:761
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:762
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:763
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:764
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:765
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:766
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:767
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:768
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:769
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:770
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:771
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:772
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:773
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:774
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:775
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:776
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:777
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:778
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:779
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:780
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:781
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:782
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:783
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:784
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:785
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:786
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:787
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:788
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:789
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:790
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:791
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:792
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:793
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:794
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:795
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:796
+#, fuzzy
+msgid "Lexmark Optra E"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:797
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:798
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:799
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:800
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:801
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:802
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:803
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:805
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:806
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:807
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:808
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:809
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:810
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:811
+msgid "Okidata OL400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:812
+msgid "Okidata OL400e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:813
+msgid "Okidata OL400ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:814
+msgid "Okidata OL410e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:815
+msgid "Okidata OL600e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:816
+msgid "Okidata OL610e/S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:817
+msgid "Okidata OL800"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:818
+msgid "Okidata OL810ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:819
+msgid "Okidata Okipage 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:820
+msgid "Okidata Okipage 6ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:821
+msgid "Okidata Okipage 8p"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:822
+msgid "Okidata Okipage 10e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:823
+msgid "Okidata Okipage 10ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:824
+msgid "Okidata Okipage 14ex"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:825
+msgid "Okidata Super 6e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:826
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:827
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:828
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:829
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:830
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:831
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:832
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:833
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:834
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:835
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:836
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:837
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:838
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:839
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:840
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:841
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:842
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:843
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:844
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:845
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:846
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:847
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:848
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:849
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:850
+#, fuzzy
+msgid "Sony IJP-V100"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:851
+msgid "Star LS-04"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:852
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "設定�表機"
+
+#: src/main/xmli18n-tmp.h:853
+msgid "Tally MT908"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:854
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:855
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:856
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:857
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:858
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:860
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:861
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:862
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:863
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:864
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:865
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:866
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:454
-msgid "Olympus P10"
+#: src/main/xmli18n-tmp.h:867
+#, fuzzy
+msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:455
-msgid "Olympus P200"
+#: src/main/xmli18n-tmp.h:868
+#, fuzzy
+msgid "Olympus P-11"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:869
+#, fuzzy
+msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:456
-msgid "Olympus P300"
+#: src/main/xmli18n-tmp.h:870
+#, fuzzy
+msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:457
-msgid "Olympus P400"
+#: src/main/xmli18n-tmp.h:871
+#, fuzzy
+msgid "Olympus P-300E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:872
+#, fuzzy
+msgid "Olympus P-300U"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:873
+#, fuzzy
+msgid "Olympus P-330E"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:874
+#, fuzzy
+msgid "Olympus P-330NE"
+msgstr "Olympus P300"
+
+#: src/main/xmli18n-tmp.h:875
+#, fuzzy
+msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:458
-msgid "Olympus P440"
+#: src/main/xmli18n-tmp.h:876
+#, fuzzy
+msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:459
-msgid "Canon CP100"
+#: src/main/xmli18n-tmp.h:877
+#, fuzzy
+msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:460
-msgid "Canon CP220"
+#: src/main/xmli18n-tmp.h:878
+#, fuzzy
+msgid "Canon CP-200"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:879
+#, fuzzy
+msgid "Canon CP-220"
+msgstr "Canon CP220"
+
+#: src/main/xmli18n-tmp.h:880
+#, fuzzy
+msgid "Canon CP-300"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:881
+#, fuzzy
+msgid "Canon CP-330"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:882
+#, fuzzy
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:883
+#, fuzzy
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:884
+#, fuzzy
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:885
+#, fuzzy
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:886
+#, fuzzy
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:887
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:888
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:463
-msgid "Fujifilm Printpix CX-400"
+#: src/main/xmli18n-tmp.h:889
+#, fuzzy
+msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:464
-msgid "Fujifilm Printpix CX-550"
+#: src/main/xmli18n-tmp.h:890
+#, fuzzy
+msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:891
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:892
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4751,78 +6959,79 @@ msgstr ""
 msgid "_Gamma value"
 msgstr "_Gamma 值"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:133
 msgid "Printer Features"
 msgstr "�表機功能"
 
-#: src/cups/genppd.c:135
+#: src/cups/genppd.c:134
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:139
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:140
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:141
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:142
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:143
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:144
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:190 src/cups/genppd.c:199
+#: src/cups/genppd.c:189 src/cups/genppd.c:198
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:868
+#: src/cups/genppd.c:890
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:892
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1424
+#: src/cups/genppd.c:1467
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1426
+#: src/cups/genppd.c:1469
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1454
+#: src/cups/genppd.c:1499
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/escputil/escputil.c:69
+#: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil 版本 "
 
-#: src/escputil/escputil.c:70
+#: src/escputil/escputil.c:71
 msgid ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
 "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type 'escputil -l' for details.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:75
+#: src/escputil/escputil.c:76
+#, fuzzy
 msgid ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -4838,11 +7047,26 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
+"\n"
+"\n"
+"版權所有 © 1997-2003 Michael Sweet�Robert Krawitz\n"
+"�整個 Gutenprint 開發隊�。\n"
+"\n"
+"請�覽我們的網�： http://gimp-print.sourceforge.net\n"
+"\n"
+"本程�為自由軟體；您��據自由軟體基金會所發表的GNU通用公共授權�款�定，就本"
+"程��為散布與�或修改；無論您�據的是本授權的第二版或（您自行�擇的）任一日"
+"後發行的版本。\n"
+"本程�係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性或特定目的"
+"�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
+"您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
+"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
 
-#: src/escputil/escputil.c:116
+#: src/escputil/escputil.c:119
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
@@ -4880,13 +7104,16 @@ msgid ""
 "    -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:155
+#: src/escputil/escputil.c:161
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
 "Perform maintenance on EPSON Stylus (R) printers.\n"
 "Examples: escputil -i -r /dev/usb/lp0\n"
 "          escputil -c -u -P MyQueue\n"
@@ -4921,76 +7148,88 @@ msgid ""
 "    -q Suppress the banner.\n"
 "    -S Print the short name of the printer with -d.\n"
 "    -m Specify the precise printer model for head alignment.\n"
+"    -C Specify the number of pattern choices for alignment\n"
+"    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:316 src/escputil/escputil.c:324
+#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr ""
 
-#: src/escputil/escputil.c:332
+#: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
 msgstr ""
 
-#: src/escputil/escputil.c:354
+#: src/escputil/escputil.c:369
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:376
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "�項 %c �明\n"
 
-#: src/escputil/escputil.c:362
+#: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "用法：%s [�項] 指令\n"
 
-#: src/escputil/escputil.c:364
+#: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:366
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:414
+#: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "無法開啟�置 %s：%s\n"
 
-#: src/escputil/escputil.c:437
+#: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:450 src/escputil/escputil.c:460
+#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "無法將指令�出至�表機\n"
 
-#: src/escputil/escputil.c:515
+#: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:520
+#: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "無法由 %s 讀�資料：%s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
-#: src/escputil/escputil.c:1161
+#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1469
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
+#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
-#: src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -4999,15 +7238,7 @@ msgstr ""
 "\n"
 "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
-#: src/escputil/escputil.c:1237
-#, c-format
-msgid ""
-"\n"
-"Cannot get credit (packet mode)!\n"
-msgstr ""
-
-#: src/escputil/escputil.c:766
+#: src/escputil/escputil.c:869
 #, c-format
 msgid ""
 "\n"
@@ -5015,82 +7246,224 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
-#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
-#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
-#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
-#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
-#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
-#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
+#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
+#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
 msgid "Unknown"
 msgstr "�詳"
 
-#: src/escputil/escputil.c:919
-msgid "ink levels"
+#: src/escputil/escputil.c:1011
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:922
-msgid "status"
-msgstr "狀態"
+#: src/escputil/escputil.c:1014
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
 
-#: src/escputil/escputil.c:927
+#: src/escputil/escputil.c:1017
 #, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1020
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "彩度"
+
+#: src/escputil/escputil.c:1023
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1026
+#, c-format
+msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1029
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1032
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1035
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1038
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1052
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1055
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1058
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1061
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1064
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1067
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1070
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1073
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1076
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Ink color"
 msgstr "墨水�色"
 
-#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
+#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Warning: Black Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1293
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1302
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1331
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1334
+msgid "status"
+msgstr "狀態"
+
+#: src/escputil/escputil.c:1339
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1144
+#: src/escputil/escputil.c:1451
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
-#: src/escputil/escputil.c:1332
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
-#: src/escputil/escputil.c:1333
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "日期"
 
-#: src/escputil/escputil.c:1371
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1389
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "無法識別�表機型號。\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1709
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1419
+#: src/escputil/escputil.c:1724
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1423
+#: src/escputil/escputil.c:1728
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5129,7 +7502,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1458
+#: src/escputil/escputil.c:1763
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5165,12 +7538,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1502
+#: src/escputil/escputil.c:1807
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1512
+#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1824
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5182,38 +7560,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
-#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
-#: src/escputil/escputil.c:1658
+#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
+#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
+#: src/escputil/escputil.c:1990
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1525
+#: src/escputil/escputil.c:1839
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1530
+#: src/escputil/escputil.c:1846
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1537
+#: src/escputil/escputil.c:1853
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1543
+#: src/escputil/escputil.c:1861
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1549
+#: src/escputil/escputil.c:1867
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5223,44 +7601,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1559
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid "About to save settings..."
 msgstr "準備儲存設定..."
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1885
 #, c-format
 msgid "failed!\n"
 msgstr "失敗�\n"
 
-#: src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1886
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1570
+#: src/escputil/escputil.c:1890
 #, c-format
 msgid "succeeded!\n"
 msgstr "�功�\n"
 
-#: src/escputil/escputil.c:1571
+#: src/escputil/escputil.c:1891
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1576
+#: src/escputil/escputil.c:1896
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1579
+#: src/escputil/escputil.c:1899
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1584
+#: src/escputil/escputil.c:1904
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5271,12 +7649,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
+#: src/escputil/escputil.c:2043
 msgid "Press enter to continue > "
 msgstr "請按 enter 繼續 > "
 
-#: src/escputil/escputil.c:1651
+#: src/escputil/escputil.c:1976
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5284,42 +7662,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1657
+#: src/escputil/escputil.c:1989
 #, c-format
 msgid "Pass #%d"
 msgstr "第 %d 次"
 
-#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
+#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "請放入白紙。\n"
 
-#: src/escputil/escputil.c:1682
+#: src/escputil/escputil.c:2016
 #, c-format
 msgid "Number out of range!\n"
 msgstr "數字超出範�以外�\n"
 
-#: src/escputil/escputil.c:1687
+#: src/escputil/escputil.c:2021
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:2027
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1700
+#: src/escputil/escputil.c:2034
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1703
+#: src/escputil/escputil.c:2037
 #, c-format
 msgid "succeeded.\n"
 msgstr "�功。\n"
 
-#: src/escputil/escputil.c:1704
+#: src/escputil/escputil.c:2038
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5328,7 +7706,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1750
+#: src/escputil/escputil.c:2084
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5337,11 +7715,11 @@ msgstr ""
 msgid "Printing..."
 msgstr "列�中..."
 
-#: src/gimp/print.c:132 src/gimp2/print.c:136
+#: src/gimp/print.c:133 src/gimp2/print.c:137
 msgid "<Image>/File/Print..."
 msgstr "<Image>/檔案/列�..."
 
-#: src/ghost/ijsgutenprint.c:93
+#: src/ghost/ijsgutenprint.c:98
 #, c-format
 msgid ""
 "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
@@ -5353,117 +7731,181 @@ msgid ""
 "not match the PPD file (%s).\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:182
+#: src/ghost/ijsgutenprint.c:190
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:198
 #, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:217 src/ghost/ijsgutenprint.c:237
+#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
 #, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:489
+#: src/ghost/ijsgutenprint.c:497
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr "錯誤：ijsgutenprint：�表機必須用 -sDeviceModel �項指定\n"
 
-#: src/ghost/ijsgutenprint.c:491
+#: src/ghost/ijsgutenprint.c:499
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
 msgstr "錯誤：ijsgutenprint：�表機 %s �屬於已知的型號\n"
 
-#: src/ghost/ijsgutenprint.c:618
+#: src/ghost/ijsgutenprint.c:655
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
 msgstr "ijsgutenprint：DeviceModel %s �明\n"
 
-#: src/ghost/ijsgutenprint.c:645
+#: src/ghost/ijsgutenprint.c:699
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:668
+#: src/ghost/ijsgutenprint.c:722
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:739
+#: src/ghost/ijsgutenprint.c:794
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:746
+#: src/ghost/ijsgutenprint.c:801
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:753
+#: src/ghost/ijsgutenprint.c:808
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:760
+#: src/ghost/ijsgutenprint.c:815
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:774
+#: src/ghost/ijsgutenprint.c:829
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:785
+#: src/ghost/ijsgutenprint.c:840
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:811
+#: src/ghost/ijsgutenprint.c:866
 #, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1221
-#, c-format
-msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-msgstr ""
-
-#: src/ghost/ijsgutenprint.c:1232
+#: src/ghost/ijsgutenprint.c:1303
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1243
+#: src/ghost/ijsgutenprint.c:1314
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1255
+#: src/ghost/ijsgutenprint.c:1326
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
 msgstr "錯誤：ijsgutenprint：無法開啟 %s：%s\n"
 
-#: src/ghost/ijsgutenprint.c:1267
+#: src/ghost/ijsgutenprint.c:1338
 #, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1346
+#: src/ghost/ijsgutenprint.c:1508
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgstr ""
 
-#: src/ghost/ijsgutenprint.c:1356
+#: src/ghost/ijsgutenprint.c:1526
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Canon BJC 4400 photo"
+#~ msgstr "Canon BJC 4400 photo"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP4000"
+#~ msgstr "Canon S400"
+
+#~ msgid "EPSON Stylus Photo 785EPX"
+#~ msgstr "EPSON Stylus Photo 785EPX"
+
+#~ msgid "EPSON CL-700"
+#~ msgstr "EPSON CL-700"
+
+#~ msgid "EPSON CL-750"
+#~ msgstr "EPSON CL-750"
+
+#~ msgid "EPSON CL-760"
+#~ msgstr "EPSON CL-760"
+
+#, fuzzy
+#~ msgid "EPSON E-100"
+#~ msgstr "EPSON EM-900C"
+
+#~ msgid "EPSON MC-2000"
+#~ msgstr "EPSON MC-2000"
+
+#~ msgid "EPSON MC-7000"
+#~ msgstr "EPSON MC-7000"
+
+#~ msgid "EPSON MC-10000"
+#~ msgstr "EPSON MC-10000"
+
+#~ msgid "EPSON MJ-6000C"
+#~ msgstr "EPSON MJ-6000C"
+
+#~ msgid "HP DeskJet 600/600C"
+#~ msgstr "HP DeskJet 600/600C"
+
+#~ msgid "HP DeskJet 600 series"
+#~ msgstr "HP DeskJet 600 系列"
+
+#~ msgid "HP DeskJet 690 series"
+#~ msgstr "HP DeskJet 690 系列"
+
+#~ msgid "HP DeskJet 900 series"
+#~ msgstr "HP DeskJet 900 系列"
+
+#~ msgid "HP DeskJet 2000 series"
+#~ msgstr "HP DeskJet 2000 系列"
+
+#~ msgid "HP DeskJet 2500 series"
+#~ msgstr "HP DeskJet 2500 系列"
+
+#~ msgid "HP LaserJet II series"
+#~ msgstr "HP LaserJet II 系列"
+
+#~ msgid "HP LaserJet III series"
+#~ msgstr "HP LaserJet III 系列"
+
+#~ msgid "HP LaserJet 4 series"
+#~ msgstr "HP LaserJet 4 系列"
+
+#~ msgid "HP LaserJet 5 series"
+#~ msgstr "HP LaserJet 5 系列"
+
+#~ msgid "HP LaserJet 6 series"
+#~ msgstr "HP LaserJet 6 系列"
+
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "無法識別�表機�\n"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index fe732ef..04e2df6 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -251,6 +254,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -500,9 +504,6 @@ uninstall-am: uninstall-info-am uninstall-pkgsampledataDATA
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index ee4e868..1b615fc 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -243,6 +246,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -477,9 +481,6 @@ uninstall-am: uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/scripts/config.guess b/scripts/config.guess
index ad5281e..910f4ee 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-08-03'
+timestamp='2005-07-08'
 
 # 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
@@ -138,6 +138,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_MACHINE}" in
+    i?86)
+	test -z "$VENDOR" && VENDOR=pc
+	;;
+    *)
+	test -z "$VENDOR" && VENDOR=unknown
+	;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -794,7 +804,7 @@ EOF
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -815,25 +825,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo cris-axis-linux
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo crisv32-axis-linux
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+    	echo frv-${VENDOR}-linux
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -852,7 +862,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -871,16 +881,13 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -894,33 +901,33 @@ EOF
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+	  *)    echo hppa-${VENDOR}-linux ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-${VENDOR}-linux
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -935,18 +942,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
 		exit ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linuxoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -976,7 +983,7 @@ EOF
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
diff --git a/scripts/config.sub b/scripts/config.sub
index 1c366df..6e2bdbf 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1181,7 +1181,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1215,9 +1215,6 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
diff --git a/scripts/global.mk b/scripts/global.mk
index 026e714..0aa97b9 100644
--- a/scripts/global.mk
+++ b/scripts/global.mk
@@ -3,8 +3,8 @@
 
 # Variables
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 8fc56db..06823e0 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
+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
@@ -2082,10 +2082,7 @@ EOF
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3204,11 +3201,6 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/scripts/mkchlog b/scripts/mkchlog
index a51c034..4a0b5d0 100755
--- a/scripts/mkchlog
+++ b/scripts/mkchlog
@@ -8,6 +8,7 @@
 %logmsgs = ();			# Index by date, time, and author
 %fileversions = ();
 $skipme = 0;
+%basenames = ();
 
 @cvsdirs=`find . -type d -name CVS -print`;
 map { chomp; s,^\./,, } @cvsdirs;
@@ -18,6 +19,7 @@ foreach $d (@cvsdirs) {
 	while (<ENTRIES>) {
 	    local ($type, $file, $version, @junk) = split /\//;
 	    if ($type eq "") {
+		$basenames{"$file"} = "1";
 		$file = "$rootdir$file";
 		$fileversions{$file} = $version;
 	    }
@@ -70,15 +72,35 @@ sub compare_versions
     # There is a special case: If the working version doesn't exist at all,
     # we return true if the log version is on the mainline.  This lets us
     # see log messages from files that have been deleted.
+    #
+    # Return value:
+    #
+    # 4 if there is no working version and the log version is at top level
+    # 
+    # 2 if there is no working version and the log version is not at top
+    #   level
+    #
+    # 3 if the number of components in the log version exceeds the number
+    #   of components in the working version
+    #
+    # 0 if the log version is later than or on a different branch from
+    #   the working version
+    #
+    # 1 otherwise (if the log version is a predecessor of the working version)
 
     my ($vw, $vl) = @_;
 
+    my (@vvl) = split /\./, $vl;
+
     if ($vw eq "") {
-	return 2;
+	if ($#vvl < 2) {
+	    return 2;
+	} else {
+	    return 4;
+	}
     }
 
     my (@vvw) = split /\./, $vw;
-    my (@vvl) = split /\./, $vl;
     if ($#vvl > $#vvw) {
 	return 3;
     }
@@ -110,21 +132,24 @@ while (<>) {
 	next;
     } elsif (/^revision /) {
 	($ignore, $revision) = split;
+	my ($currentbasefile) = $currentfile;
+	$currentbasefile =~ s;.*/([^/]+);\1;;
 	my ($check) =&compare_versions($fileversions{$currentfile}, $revision);
 	#
-	# Special case -- if a file is not in the current sandbox, but is
-	# at top level, log it; otherwise if it is not in the current
-	# sandbox, don't log it.
+	# Special case -- if a file is not in the current sandbox, but it
+	# has the same base name as a file in the sandbox, log it;
+	# otherwise if it is not in the current sandbox, don't log it.
 	# 
-	if (($check == 2 && !($currentfile =~ /\//)  &&
-	     ($currentfile =~ /\.[chly]$/)) ||
+	if (($check == 2 && (1 || (
+	     ($basenames{"$currentbasefile"} || !($currentfile =~ /\//)) &&
+	     ($currentfile =~ /\.[chly]$/)))) ||
 	    $check == 1) {
 	    $skipme = 0;
 	} else {
 	    $skipme = 1;
 	}
     } elsif (/^date: /) {
-	($ignore, $date, $time, $ignore, $author, $ignore, $ignore,
+	($ignore, $date, $time, $ignore, $author, $ignore, $state,
 	 $ignore, $plus, $minus, $ignore) = split;
 #	$time =~ s/[0-9]:[0-9][0-9];$//;
 #	$time =~ s/[0-9][0-9];$//;
@@ -149,8 +174,14 @@ while (<>) {
 	$datetimeauthor = "$date $time $author $junkbody $currentfile $revision";
 	if ($skipme == 0) {
 	    $logmsgs{$datetimeauthor} = $body;
-	    $plus{$datetimeauthor} = $plus;
-	    $minus{$datetimeauthor} = $minus;
+	    if ($plus eq "") {
+		$plus{$datetimeauthor} = "added";
+	    } elsif ($state eq "dead;") {
+		$plus{$datetimeauthor} = "removed";
+	    } else {
+		$plus{$datetimeauthor} = $plus;
+		$minus{$datetimeauthor} = $minus;
+	    }
 	}
     }				# Other junk we ignore
 }
@@ -160,13 +191,20 @@ $header="";
 @fileinfo = ();
 
 @chlog = reverse sort keys %logmsgs;
+%filenames_printed = ();
 
 foreach $_ (@chlog) {
     ($date, $time, $author, $junk, $file, $revision) = split;
     $date =~ s,/,-,g;
     $msg = $logmsgs{$_};
-    if ($prevmsg eq $msg) {
-	push @fileinfo, "\t\t$file ($revision) ($plus{$_} $minus{$_})\n";
+    my $delta;
+    if (! $minus{$_}) {
+	$delta = "$plus{$_}";
+    } else {
+	$delta = "$plus{$_} $minus{$_}";
+    }
+    if ($prevmsg eq $msg && !$filenames_printed{$file}) {
+	push @fileinfo, "\t\t$file ($revision) ($delta)\n";
     } else {
 	if ($prevmsg ne "" || $#fileinfo >= 0) {
 	    print $header;
@@ -178,15 +216,17 @@ foreach $_ (@chlog) {
 	    $prevmsg =~ s/[ \t]+\n/\n/g;
 	    $prevmsg =~ s/[ \t]+$//g;
 	    print "$prevmsg\n";
+	    %filenames_printed = ();
 	}
 	$header = "$date\t<$author\@sourceforge.net>\n\n";
 	$prevmsg = $msg;
 	@fileinfo = ();
-	push @fileinfo, "\t\t$file ($revision) ($plus{$_} $minus{$_})\n";
+	push @fileinfo, "\t\t$file ($revision) ($delta)\n";
+	$filenames_printed{$file} = 1;
     }
 }
 
-if ($prevmsg ne "" or $fileinfo ne "") {
+if ($prevmsg ne "" or $#fileinfo >= 0) {
     print "$date\t<$author\@sourceforge.net>\n\n";
     $filestuff = join "", sort @fileinfo;
     $filestuff =~ s/\t/\tFiles:/;
diff --git a/src/Makefile.in b/src/Makefile.in
index 3d4243a..0de1821 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#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@
@@ -250,6 +253,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -635,9 +639,6 @@ uninstall-info: uninstall-info-recursive
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index f4ffc06..011bd07 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.83 2005/11/22 14:43:05 rleigh Exp $
+## $Id: Makefile.am,v 1.87 2006/05/14 16:46:03 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -45,6 +45,9 @@ endif
 
 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
 
@@ -157,7 +160,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
@@ -171,7 +174,7 @@ ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in C ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -p ppd/$$language ; \
+	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
 	done
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -179,10 +182,10 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	cd $(top_builddir)/po ; \
 	$(MAKE) ; \
 	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
 	done
 	$(RM) -r catalog
 
@@ -213,5 +216,7 @@ EXTRA_DIST = \
 	README \
 	calibrate.ppm \
 	command.txt \
-	command.types
+	command.types \
+	test-ppds
+
 
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index 9f1ccf9..b0b8b9e 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
+
 
 
 srcdir = @srcdir@
@@ -321,6 +324,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -388,6 +392,8 @@ cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/
 @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_CUPS_TRUE@sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 @BUILD_GENPPD_STATIC_TRUE@STATIC_LDOPTS = -static -export-dynamic
 cups_calibrate_SOURCES = cups-calibrate.c
@@ -420,7 +426,8 @@ EXTRA_DIST = \
 	README \
 	calibrate.ppm \
 	command.txt \
-	command.types
+	command.types \
+	test-ppds
 
 all: all-am
 
@@ -719,6 +726,79 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+		echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+		xfail=`expr $$xfail + 1`; \
+		echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 distdir: $(DISTFILES)
 	$(mkdir_p) $(distdir)/../../scripts
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -751,6 +831,7 @@ distdir: $(DISTFILES)
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local
 installdirs:
@@ -842,8 +923,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
 	uninstall-local uninstall-pkgdataDATA uninstall-pkgsysconfDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
+.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+	clean clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
 	clean-cupsexec_filterPROGRAMS clean-generic clean-libtool \
 	clean-local clean-sbinPROGRAMS ctags dist-hook distclean \
 	distclean-compile distclean-generic distclean-libtool \
@@ -867,9 +948,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
@@ -933,7 +1011,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
@@ -947,7 +1025,7 @@ ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in C ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -p ppd/$$language ; \
+	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
 	done
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -955,10 +1033,10 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	cd $(top_builddir)/po ; \
 	$(MAKE) ; \
 	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
 	done
 	$(RM) -r catalog
 
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 1b90140..b0c3b0b 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.22 2005/12/24 22:41:11 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.24 2006/03/29 02:27:15 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -37,6 +37,8 @@ our $opt_n; # No action
 our $opt_q; # Quiet mode
 our $opt_s; # Source PPD location
 our $opt_v; # Verbose mode
+our $opt_N; # Don't update PPD file options
+our $opt_o; # Output directory
 
 my $debug = 0;
 my $verbose = 0;   # Verbose output
@@ -45,11 +47,13 @@ if ($debug) {
 }
 my $quiet = 0;     # No output
 my $no_action = 0; # Don't output files
+my $reset_defaults = 0;		# Reset options to default settings
 my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
 
 my $ppd_dir = "@cups_conf_serverroot@/ppd"; # Location of in-use CUPS PPDs
 my $ppd_root_dir = "@cups_conf_datadir@/model";
 my $ppd_base_dir = "$ppd_root_dir/gutenprint/$version"; # Available PPDs
+my $ppd_out_dir = "";		# By default output into source directory
 my $gzext = ".gz";
 my $updated_ppd_count = 0;
 
@@ -65,6 +69,7 @@ my %languagemappings = (
 			"french"     => "fr",
 			"german"     => "de",
 			"greek"      => "el",
+			"hungarian"  => "hu",
 			"italian"    => "it",
 			"japanese"   => "jp",
 			"norwegian"  => "no",
@@ -90,10 +95,44 @@ umask 0177;
 
 # Find all in-use Gutenprint PPD files...
 
-my @ppdglob = glob("$ppd_dir/*.{ppd,PPD}");
+my @ppdglob;
+if (@ARGV) {
+    my $f;
+    foreach $f (@ARGV) {
+	if (-f $f and ($f =~ /\.ppd$/i or $f =~ /\//)) {
+	    if (-f $f) {
+		push @ppdglob, $f;
+	    } else {
+		print STDERR "Cannot find file $f\n";
+	    }
+	} elsif (-f "$ppd_dir/$f" or
+		 -f "$ppd_dir/$f.ppd" or
+		 -f "$ppd_dir/$f.PPD") {
+	    if (-f "$ppd_dir/$f") {
+		push @ppdglob, "$ppd_dir/$f";
+	    }
+	    if (-f "$ppd_dir/$f.ppd") {
+		push @ppdglob, "$ppd_dir/$f.ppd";
+	    }
+	    if (-f "$ppd_dir/$f.PPD") {
+		push @ppdglob, "$ppd_dir/$f.PPD";
+	    }
+	}  else {
+	    print STDERR "Cannot find file $ppd_dir/$f, $ppd_dir/$f.ppd, or $ppd_dir/$f.PPD\n";
+	}
+    }
+} else {
+    @ppdglob = glob("$ppd_dir/*.{ppd,PPD}");
+}
 my $ppdlist = join ' ', @ppdglob;
 if (@ppdglob) {
-    open PPDFILES, '-|', 'egrep', '-i', '-l', 'Gutenprint|Gimp-Print', @ppdglob or die "can't grep $ppd_dir/*: $!";
+    open PPDFILES, '-|', 'egrep', '-i', '-l', 'Gutenprint|Gimp-Print', @ppdglob or die "can't grep $ppdlist: $!";
+    while (<PPDFILES>) {
+	chomp;
+	push @ppd_files,  $_;
+    }
+    open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!";
+    @ppd_files = ();
     while (<PPDFILES>) {
 	chomp;
 	push @ppd_files,  $_;
@@ -118,7 +157,11 @@ foreach (@ppd_files) {
 
 if (!$quiet || $verbose) {
     if ($updated_ppd_count > 0) {
-	print STDOUT "Updated $updated_ppd_count PPD files.  Restart cupsd for the changes to take effect.\n";
+	my $plural = "";
+	if ($updated_ppd_count != 1) {
+	    $plural = "s";
+	}
+	print STDOUT "Updated $updated_ppd_count PPD file${plural}.  Restart cupsd for the changes to take effect.\n";
 	exit (0);
     } else {
 	print STDOUT "Failed to update any PPD files\n";
@@ -129,7 +172,7 @@ if (!$quiet || $verbose) {
 
 
 sub parse_options () {
-    getopts("dhnqs:v");
+    getopts("dhnqs:vNo:");
 
     if ($opt_n) {
 	$no_action = 1;
@@ -142,7 +185,7 @@ sub parse_options () {
 	    $ppd_base_dir = "$opt_s";
 	}
 	else {
-	    die "$opt_s: invalid directory: $!";
+	    die "$opt_s: invalid directory: $!\n";
 	}
     }
     if ($opt_v) {
@@ -153,8 +196,19 @@ sub parse_options () {
 	$verbose = 0;
 	$quiet = 1;
     }
+    if ($opt_N) {
+	$reset_defaults = 1;
+    }
+    if ($opt_o) {
+	if (-d $opt_o) {
+	    $ppd_out_dir = "$opt_o";
+	}
+	else {
+	    die "$opt_s: invalid directory: $!\n";
+	}
+    }
     if ($opt_h) {
-	print "Usage: $0 [OPTION]...\n";
+	print "Usage: $0 [OPTION]... [PPD_FILE]...\n";
 	print "Update CUPS+Gutenprint PPD files.\n\n";
         print "  -d          Enable debugging\n";
         print "  -h          Display this help text\n";
@@ -162,6 +216,8 @@ sub parse_options () {
 	print "  -q          Quiet mode.  No messages except errors.\n";
 	print "  -s ppd_dir  Use ppd_dir as the source PPD directory.\n";
 	print "  -v          Verbose messages.\n";
+	print "  -N          Reset options to defaults.\n";
+	print "  -o out_dir  Output PPD files to out_dir.\n";
 	exit (0);
     }
 }
@@ -170,6 +226,11 @@ sub parse_options () {
 # Update the named PPD file.
 sub update_ppd ($) {
     my $ppd_source_filename = $_;
+    my $ppd_dest_filename = $ppd_source_filename;
+    if ($ppd_out_dir) {
+	$ppd_dest_filename =~ s;(.*)/([^/]+);$2;;
+	$ppd_dest_filename = "$ppd_out_dir/$ppd_dest_filename";
+    }
 
     open ORIG, $_ or die "$_: can't open PPD file: $!";
     seek (ORIG, 0, 0) or die "can't seek to start of PPD file";
@@ -177,7 +238,6 @@ sub update_ppd ($) {
     if ($debug) {
 	print "Source Filename: $ppd_source_filename\n";
     }
-    # Get the `PCFileName'; the new source PPD will have the same name.
     my ($filename) = "";
     my ($driver) = "";
     my ($gutenprintdriver) = "";
@@ -322,45 +382,46 @@ sub update_ppd ($) {
 
     }
 
-    # Update source buffer with old defaults...
+    if  (! $reset_defaults) {
+	# Update source buffer with old defaults...
 
-    # Loop through each default in turn.
+	# Loop through each default in turn.
 default_loop:
-    foreach (sort keys %defaults) {
-	my $default_option = $_;
-	my $option;
-	($option = $_) =~ s/Default//; # Strip off `Default'
-	# Check method is valid
-	my $orig_method = $orig_default_types{$option};
-	my $new_method = $new_default_types{$option};
-	if ((!defined($orig_method) || !defined($new_method)) ||
-	    $orig_method ne $new_method) {
-	    next;
-	}
-	if ($new_method eq "PickOne") {
-            # Check the old setting is valid
-	    foreach (@{$options{$option}}) {
-		if ($defaults{$default_option} eq $_) { # Valid option
-		    # Set the option in the new PPD
-		    $source_data =~ s/\*($default_option).*/*$1:$defaults{$default_option}/m;
-		    if ($verbose) {
-			print "$ppd_source_filename: Set *$default_option to $defaults{$default_option}\n";
+	foreach (sort keys %defaults) {
+	    my $default_option = $_;
+	    my $option;
+	    ($option = $_) =~ s/Default//; # Strip off `Default'
+	    # Check method is valid
+	    my $orig_method = $orig_default_types{$option};
+	    my $new_method = $new_default_types{$option};
+	    if ((!defined($orig_method) || !defined($new_method)) ||
+		$orig_method ne $new_method) {
+		next;
+	    }
+	    if ($new_method eq "PickOne") {
+		# Check the old setting is valid
+		foreach (@{$options{$option}}) {
+		    if ($defaults{$default_option} eq $_) { # Valid option
+			# Set the option in the new PPD
+			$source_data =~ s/\*($default_option).*/*$1:$defaults{$default_option}/m;
+			if ($verbose) {
+			    print "$ppd_source_filename: Set *$default_option to $defaults{$default_option}\n";
+			}
+			next default_loop;
 		    }
-		    next default_loop;
 		}
+		printf STDERR
+		    "$ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Skipped.\n";
+		next;
 	    }
-	    printf STDERR
-		"$ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Skipped.\n";
-	    next;
+	    print STDERR
+		"$ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.  Skipped\n";
 	}
-	print STDERR
-	    "$ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.  Skipped\n";
     }
 
-
     # Write new PPD...
 
-    my $tmpnew = "${ppd_source_filename}.new";
+    my $tmpnew = "${ppd_dest_filename}.new";
     if (! open NEWPPD, "> $tmpnew") {
 	warn "Can't open $tmpnew for writing: $!\n";
 	return 0;
@@ -372,16 +433,20 @@ default_loop:
 	return 0;
     }
 
-    if (! rename $tmpnew, $ppd_source_filename) {
-	warn "Can't rename $tmpnew to $ppd_source_filename: $!\n";
+    if (! rename $tmpnew, $ppd_dest_filename) {
+	warn "Can't rename $tmpnew to $ppd_dest_filename: $!\n";
 	unlink $tmpnew;
 	return 0;
     }
-    chown($orig_metadata[4], $orig_metadata[5], $ppd_source_filename);
-    chmod(($orig_metadata[2] & 0777), $ppd_source_filename);
+    chown($orig_metadata[4], $orig_metadata[5], $ppd_dest_filename);
+    chmod(($orig_metadata[2] & 0777), $ppd_dest_filename);
 
     if (!$quiet || $verbose) {
-	print STDOUT "Updated $ppd_source_filename using $source\n";
+	if ($ppd_dest_filename eq $ppd_source_filename) {
+	    print STDOUT "Updated $ppd_source_filename using $source\n";
+	} else {
+	    print STDOUT "Updated $ppd_source_filename to $ppd_dest_filename using $source\n";
+	}
     }
     return 1;
     # All done!
@@ -394,9 +459,14 @@ sub find_ppd ($$$$) {
     my ($key) = '^\\*FileVersion:[ 	]*"@VERSION@"$';
     my ($lingo, $suffix, $base, $basedir);
     my ($current_best_file, $current_best_time);
-    my ($stored_name, $stored_dir);
+    my ($stored_name, $stored_dir, $simplified);
     $stored_name = $gutenprintfilename;
-    $stored_name =~ s,.*/([^/]*)(.gz)?$,$1,;
+    $stored_name =~ s,.*/([^/]*)(.sim)?(.ppd)?(.gz)?$,$1,;
+    if ($gutenprintfilename =~ m,.*/([^/]*)(.sim)(.ppd)?(.gz)?$,) {
+	$simplified = ".sim";
+    } else {
+	$simplified = "";
+    }
     $stored_dir = $gutenprintfilename;
     $stored_dir =~ s,(.*)/([^/]*)$,$1,;
 
@@ -411,8 +481,8 @@ sub find_ppd ($$$$) {
 		    "") {
 	foreach $suffix (".ppd$gzext",
 			 ".ppd") {
-	    foreach $base ("${drivername}.$version",
-                           "stp-${drivername}.$version",
+	    foreach $base ("${drivername}.$version${simplified}",
+                           "stp-${drivername}.$version${simplified}",
 			   $stored_name,
 			   $drivername) {
 		foreach $basedir ($ppd_base_dir,
@@ -442,6 +512,9 @@ sub find_ppd ($$$$) {
 			    if ($sb[9] > $current_best_time) {
 				$current_best_time = $sb[9];
 				$current_best_file = $fn;
+		                if ($debug) {
+                                    print STDERR "***current_best_file is $fn\n";
+                                }
 			    }
 			} elsif ($debug) {
 			    print "   Format invalid\n";
diff --git a/src/cups/epson.c b/src/cups/epson.c
index 434c1ae..38fec8c 100644
--- a/src/cups/epson.c
+++ b/src/cups/epson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: epson.c,v 1.6 2002/12/22 21:03:32 rleigh Exp $"
+ * "$Id: epson.c,v 1.7 2006/03/18 23:54:49 rlk Exp $"
  *
  *   EPSON backend for the Common UNIX Printing System.
  *
@@ -324,9 +324,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
       while (nbytes > 0)
       {
-	if ((wbytes = write(fd_out, bufptr, nbytes)) < 0 && errno == EAGAIN)
+	if ((wbytes = write(fd_out, bufptr, nbytes)) < 0 &&
+	    (errno == EAGAIN || errno == EINTR))
 	  {
-	    /* Write would block, so sleep 0.2s and retry... */
+	    /* Write would block, so sleep 0.002s and retry... */
 
 	    /*
 	     * Check for possible data coming back from the printer...
@@ -340,13 +341,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	    read_backchannel(fd_out);
 #if defined(HAVE_TIME_H) && defined(HAVE_NANOSLEEP)
 	    sleeptime.tv_sec = 0;
-	    sleeptime.tv_nsec = 200000000;
+	    sleeptime.tv_nsec = 2000000;
 	    nanosleep(&sleeptime, &sleeptime);
 #elif defined(HAVE_UNISTD_H) && defined(HAVE_USLEEP)
 	    usleep(200000);
 #else
 	    timeout.tv_sec = 0;
-	    timeout.tv_usec = 200000;
+	    timeout.tv_usec = 2000;
 	    select(1, NULL, NULL, NULL, &timeout);
 #endif
 	    continue;
@@ -765,5 +766,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: epson.c,v 1.6 2002/12/22 21:03:32 rleigh Exp $".
+ * End of "$Id: epson.c,v 1.7 2006/03/18 23:54:49 rlk Exp $".
  */
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index bdff9fe..f9011b4 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $"
+ * "$Id: genppd.c,v 1.117 2006/04/22 00:41:04 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -124,7 +124,6 @@ const char *special_options[] =
   "Resolution",
   "OutputOrder",
   "Quality",
-  "ImageType",
   "Duplex",
   NULL
 };
@@ -161,7 +160,7 @@ int     checkcat (const struct dirent *localedir);
 void    printlangs(char** langs);
 void    printmodels(int verbose);
 int	write_ppd(const stp_printer_t *p, const char *prefix,
-		  const char *language, int verbose);
+		  const char *language, int verbose, int simplified);
 
 
 /*
@@ -218,6 +217,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
   char          **models = NULL;    /* Models to output, all if NULL */
   int           opt_printlangs = 0; /* Print available translations */
   int           opt_printmodels = 0;/* Print available models */
+  int           which_ppds = 2;	/* Simplified PPD's = 1, full = 2 */
 
  /*
   * Parse command-line args...
@@ -227,7 +227,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   for (;;)
   {
-    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:")) == -1)
+    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:sa")) == -1)
       break;
 
     switch (i)
@@ -271,6 +271,12 @@ main(int  argc,			    /* I - Number of command-line arguments */
     case 'd':
       cups_modeldir = optarg;
       break;
+    case 's':
+      which_ppds = 1;
+      break;
+    case 'a':
+      which_ppds = 3;
+      break;
     case 'V':
       printf("cups-genppd version %s, "
 	     "Copyright (c) 1993-2005 by Easy Software Products and Robert Krawitz.\n\n",
@@ -413,7 +419,11 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
 	  if (printer)
 	    {
-	      if (write_ppd(printer, prefix, language, verbose))
+	      if ((which_ppds & 1) &&
+		  write_ppd(printer, prefix, language, verbose, 1))
+		return 1;
+	      if ((which_ppds & 2) &&
+		  write_ppd(printer, prefix, language, verbose, 0))
 		return 1;
 	    }
 	  else
@@ -430,8 +440,15 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	{
 	  printer = stp_get_printer_by_index(i);
 
-	  if (printer && write_ppd(printer, prefix, language, verbose))
-	    return (1);
+	  if (printer)
+	    {
+	      if ((which_ppds & 1) &&
+		  write_ppd(printer, prefix, language, verbose, 1))
+		return (1);
+	      if ((which_ppds & 2) &&
+		  write_ppd(printer, prefix, language, verbose, 0))
+		return (1);
+	    }
 	}
     }
   if (!verbose)
@@ -458,7 +475,7 @@ void
 usage(void)
 {
   puts("Usage: cups-genppd [-c localedir] "
-        "[-l locale] [-p prefix] [-q] [-v] models...\n"
+        "[-l locale] [-p prefix] [-s | -a] [-q] [-v] models...\n"
         "       cups-genppd -L [-c localedir]\n"
 	"       cups-genppd -M [-v]\n"
 	"       cups-genppd -h\n"
@@ -484,6 +501,8 @@ help(void)
        "  -l locale     Output PPDs translated with messages for locale.\n"
        "  -p prefix     Output PPDs in directory prefix.\n"
        "  -d prefix     Embed directory prefix in PPD file.\n"
+       "  -s            Generate simplified PPD files.\n"
+       "  -a            Generate all (simplified and full) PPD files.\n"
        "  -q            Quiet mode.\n"
        "  -v            Verbose mode.\n"
        "models:\n"
@@ -745,7 +764,8 @@ int					/* O - Exit status */
 write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 	  const char          *prefix,	/* I - Prefix (directory) for PPD files */
 	  const char	      *language,
-	  int                 verbose)
+	  int                 verbose,
+	  int                 simplified)
 {
   int		i, j, k, l;		/* Looping vars */
   gzFile	fp;			/* File to write to */
@@ -772,8 +792,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   stp_parameter_list_t param_list;
   const stp_param_string_t *opt;
   int has_quality_parameter = 0;
-  int has_image_type_parameter = 0;
   int printer_is_color = 0;
+  int maximum_level = simplified ?
+    STP_PARAMETER_LEVEL_BASIC : STP_PARAMETER_LEVEL_ADVANCED4;
 
  /*
   * Initialize driver-specific variables...
@@ -819,8 +840,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
    * 
    * stp-escp2-ex.5.0.ppd.gz
    */
-  snprintf(filename, sizeof(filename) - 1, "%s/stp-%s.%s%s%s",
-	   prefix, driver, GUTENPRINT_RELEASE_VERSION, ppdext, gzext);
+  snprintf(filename, sizeof(filename) - 1, "%s/stp-%s.%s%s%s%s",
+	   prefix, driver, GUTENPRINT_RELEASE_VERSION,
+	   simplified ? ".sim" : "", ppdext, gzext);
 
  /*
   * Open the PPD file...
@@ -877,7 +899,8 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   */
 
   gzprintf(fp, "*PCFileName:	\"STP%05d.PPD\"\n",
-	   stp_get_printer_index_by_driver(driver));
+	   stp_get_printer_index_by_driver(driver) +
+	   simplified ? stp_printer_model_count() : 0);
   gzprintf(fp, "*Manufacturer:	\"%s\"\n", manufacturer);
 
  /*
@@ -909,8 +932,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
    * If this is changed, the corresponding change must be made in
    * rastertoprinter.c.  Look for "ppd->nickname"
    */
-  gzprintf(fp, "*NickName:      \"%s%s%s\"\n",
-	   long_name, CUPS_PPD_NICKNAME_STRING, VERSION);
+  gzprintf(fp, "*NickName:      \"%s%s%s%s\"\n",
+	   long_name, CUPS_PPD_NICKNAME_STRING, VERSION,
+	   simplified ? " Simplified" : "");
   if (cups_ppd_ps_level == 2)
     gzputs(fp, "*PSVersion:	\"(2017.000) 550\"\n");
   else
@@ -965,12 +989,13 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
   gzputs(fp, "\n");
   gzprintf(fp, "*StpDriverName:	\"%s\"\n", driver);
-  gzprintf(fp, "*StpPPDLocation:	\"%s%s%s/stp-%s.%s%s%s\"\n",
+  gzprintf(fp, "*StpPPDLocation:	\"%s%s%s/stp-%s.%s%s%s%s\"\n",
 	   cups_modeldir,
 	   cups_modeldir[strlen(cups_modeldir) - 1] == '/' ? "" : "/",
 	   language ? language : "C",
 	   driver,
 	   GUTENPRINT_RELEASE_VERSION,
+	   simplified ? ".sim" : "",
 	   ppdext,
 	   gzext);
   gzprintf(fp, "*StpLocale:	\"%s\"\n", language ? language : "C");	
@@ -1006,6 +1031,10 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
       variable_sizes = 1;
       continue;
     }
+    if (simplified && num_opts >= 10 &&
+	(papersize->paper_unit == PAPERSIZE_ENGLISH_EXTENDED ||
+	 papersize->paper_unit == PAPERSIZE_METRIC_EXTENDED))
+      continue;
 
     width  = papersize->width;
     height = papersize->height;
@@ -1016,7 +1045,16 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     stp_set_string_parameter(v, "PageSize", opt->name);
 
     stp_get_media_size(v, &width, &height);
-    stp_get_imageable_area(v, &left, &right, &bottom, &top);
+    stp_get_maximum_imageable_area(v, &left, &right, &bottom, &top);
+
+    if (left < 0)
+      left = 0;
+    if (right > width)
+      right = width;
+    if (bottom > height)
+      bottom = height;
+    if (top < 0)
+      top = 0;
 
     the_papers[cur_opt].name   = opt->name;
     the_papers[cur_opt].text   = opt->text;
@@ -1085,7 +1123,15 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			       &min_width, &min_height);
     stp_set_string_parameter(v, "PageSize", "Custom");
     stp_get_media_size(v, &width, &height);
-    stp_get_imageable_area(v, &left, &right, &bottom, &top);
+    stp_get_maximum_imageable_area(v, &left, &right, &bottom, &top);
+    if (left < 0)
+      left = 0;
+    if (top < 0)
+      top = 0;
+    if (bottom > height)
+      bottom = height;
+    if (right > width)
+      width = right;
 
     gzprintf(fp, "*MaxMediaWidth:  \"%d\"\n", max_width);
     gzprintf(fp, "*MaxMediaHeight: \"%d\"\n", max_height);
@@ -1120,52 +1166,67 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzprintf(fp, "*ColorModel Gray/Grayscale:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
+	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_W, CUPS_ORDER_CHUNKED);
+           CUPS_CSPACE_W, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8" : "");
   gzprintf(fp, "*ColorModel Black/Inverted Grayscale:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
+	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_K, CUPS_ORDER_CHUNKED);
+           CUPS_CSPACE_K, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8" : "");
 
   if (printer_is_color)
   {
     gzprintf(fp, "*ColorModel RGB/RGB Color:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
+	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED);
+             CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8" : "");
     gzprintf(fp, "*ColorModel CMY/CMY Color:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
+	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED);
+             CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8" : "");
     gzprintf(fp, "*ColorModel CMYK/CMYK:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
+	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED);
+             CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8" : "");
     gzprintf(fp, "*ColorModel KCMY/KCMY:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
+	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED);
+             CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8" : "");
   }
 
   gzputs(fp, "*CloseUI: *ColorModel\n\n");
 
-  /*
-   * 8 or 16 bit color (16 bit is slower)
-   */
-  gzputs(fp, "*OpenUI *StpColorPrecision/Color Precision: PickOne\n");
-  gzputs(fp, "*OrderDependency: 10 AnySetup *StpColorPrecision\n");
-  gzputs(fp, "*DefaultStpColorPrecision: Normal\n");
-  gzputs(fp, "*StpColorPrecision Normal/Normal:\t\"<<"
-	 "/cupsBitsPerColor 8>>setpagedevice\"\n");
-  gzputs(fp, "*StpColorPrecision Best/Best:\t\"<<"
-	 "/cupsBitsPerColor 8"
-	 "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n");
-  gzputs(fp, "*CloseUI: *StpColorPrecision\n\n");
+  if (!simplified)
+    {
+      /*
+       * 8 or 16 bit color (16 bit is slower)
+       */
+      gzputs(fp, "*OpenUI *StpColorPrecision/Color Precision: PickOne\n");
+      gzputs(fp, "*OrderDependency: 10 AnySetup *StpColorPrecision\n");
+      gzputs(fp, "*DefaultStpColorPrecision: Normal\n");
+      gzputs(fp, "*StpColorPrecision Normal/Normal:\t\"<<"
+	     "/cupsBitsPerColor 8>>setpagedevice\"\n");
+      gzputs(fp, "*StpColorPrecision Best/Best:\t\"<<"
+	     "/cupsBitsPerColor 8"
+	     "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n");
+      gzputs(fp, "*CloseUI: *StpColorPrecision\n\n");
+    }
 
  /*
   * Media types...
@@ -1252,67 +1313,49 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   stp_clear_string_parameter(v, "Quality");
 
  /*
-  * Image type
-  */
-
-  stp_describe_parameter(v, "ImageType", &desc);
-  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active)
-    {
-      has_image_type_parameter = 1;
-      gzprintf(fp, "*OpenUI *StpImageType/%s: PickOne\n", _(desc.text));
-      gzputs(fp, "*OrderDependency: 5 AnySetup *StpImageType\n");
-      gzprintf(fp, "*DefaultStpImageType: %s\n", desc.deflt.str);
-      num_opts = stp_string_list_count(desc.bounds.str);
-      for (i = 0; i < num_opts; i++)
-	{
-	  opt = stp_string_list_param(desc.bounds.str, i);
-	  gzprintf(fp, "*StpImageType %s/%s: \"\"\n", opt->name, opt->text);
-	}
-      gzputs(fp, "*CloseUI: *StpImageType\n\n");
-    }
-  stp_parameter_description_destroy(&desc);
-
- /*
   * Resolutions...
   */
 
   stp_describe_parameter(v, "Resolution", &desc);
   num_opts = stp_string_list_count(desc.bounds.str);
 
-  gzprintf(fp, "*OpenUI *Resolution/%s: PickOne\n", _("Resolution"));
-  gzputs(fp, "*OrderDependency: 20 AnySetup *Resolution\n");
-  if (has_quality_parameter)
-    gzprintf(fp, "*DefaultResolution: None\n");
-  else
-    gzprintf(fp, "*DefaultResolution: %s\n", desc.deflt.str);
+  if (!simplified || desc.p_level == STP_PARAMETER_LEVEL_BASIC)
+    {
+      gzprintf(fp, "*OpenUI *Resolution/%s: PickOne\n", _("Resolution"));
+      gzputs(fp, "*OrderDependency: 20 AnySetup *Resolution\n");
+      if (has_quality_parameter)
+	gzprintf(fp, "*DefaultResolution: None\n");
+      else
+	gzprintf(fp, "*DefaultResolution: %s\n", desc.deflt.str);
 
-  stp_clear_string_parameter(v, "Quality");
-  if (has_quality_parameter)
-    gzprintf(fp, "*Resolution None/%s: \"\"\n", _("Automatic"));
-  for (i = 0; i < num_opts; i ++)
-  {
-   /*
-    * Strip resolution name to its essentials...
-    */
-    opt = stp_string_list_param(desc.bounds.str, i);
-    stp_set_string_parameter(v, "Resolution", opt->name);
-    stp_describe_resolution(v, &xdpi, &ydpi);
+      stp_clear_string_parameter(v, "Quality");
+      if (has_quality_parameter)
+	gzprintf(fp, "*Resolution None/%s: \"\"\n", _("Automatic"));
+      for (i = 0; i < num_opts; i ++)
+	{
+	  /*
+	   * Strip resolution name to its essentials...
+	   */
+	  opt = stp_string_list_param(desc.bounds.str, i);
+	  stp_set_string_parameter(v, "Resolution", opt->name);
+	  stp_describe_resolution(v, &xdpi, &ydpi);
 
-    /* This should not happen! */
-    if (xdpi == -1 || ydpi == -1)
-      continue;
+	  /* This should not happen! */
+	  if (xdpi == -1 || ydpi == -1)
+	    continue;
 
-   /*
-    * Write the resolution option...
-    */
+	  /*
+	   * Write the resolution option...
+	   */
 
-    gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
-             opt->name, opt->text, xdpi, ydpi, i + 1);
-  }
+	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
+		   opt->name, opt->text, xdpi, ydpi, i + 1);
+	}
 
-  stp_parameter_description_destroy(&desc);
+      gzputs(fp, "*CloseUI: *Resolution\n\n");
+    }
 
-  gzputs(fp, "*CloseUI: *Resolution\n\n");
+  stp_parameter_description_destroy(&desc);
 
   stp_describe_parameter(v, "OutputOrder", &desc);
   if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
@@ -1361,7 +1404,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
   for (j = 0; j <= STP_PARAMETER_CLASS_OUTPUT; j++)
     {
-      for (k = 0; k <= STP_PARAMETER_LEVEL_ADVANCED4; k++)
+      for (k = 0; k <= maximum_level; k++)
 	{
 	  int printed_open_group = 0;
 	  size_t param_count = stp_parameter_list_count(param_list);
@@ -1450,14 +1493,17 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			gzprintf(fp, "*Stp%s None/%.3f: \"\"\n",
 				 desc.name, desc.deflt.dbl);
 		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
-		      gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
-			       desc.name, _(desc.text), _("Fine Adjustment"));
-		      gzprintf(fp, "*DefaultStpFine%s:None\n", desc.name);
-		      gzprintf(fp, "*StpFine%s None/0.000: \"\"\n", desc.name);
-		      for (i = 0; i < 100; i += 5)
-			gzprintf(fp, "*StpFine%s %d/%.3f: \"\"\n",
-				 desc.name, i, ((double) i) * .001);
-		      gzprintf(fp, "*CloseUI: *StpFine%s\n\n", desc.name);
+		      if (!simplified)
+			{
+			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
+				   desc.name, _(desc.text), _("Fine Adjustment"));
+			  gzprintf(fp, "*DefaultStpFine%s:None\n", desc.name);
+			  gzprintf(fp, "*StpFine%s None/0.000: \"\"\n", desc.name);
+			  for (i = 0; i < 100; i += 5)
+			    gzprintf(fp, "*StpFine%s %d/%.3f: \"\"\n",
+				     desc.name, i, ((double) i) * .001);
+			  gzprintf(fp, "*CloseUI: *StpFine%s\n\n", desc.name);
+			}
 		      print_close_ui = 0;
 		      
 		      break;
@@ -1479,9 +1525,6 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			  gzprintf(fp, "*Stp%s %d/%.1f mm: \"\"\n",
 				   desc.name, i, ((double) i) * 25.4 / 72);
 			}
-		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
-		      print_close_ui = 0;
-		      
 		      break;
 		    default:
 		      break;
@@ -1551,5 +1594,5 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
 
 /*
- * End of "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.117 2006/04/22 00:41:04 rlk Exp $".
  */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 64b0d0d..b3f74e8 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.99 2006/04/17 02:06:18 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
@@ -82,6 +82,10 @@ typedef struct
   int			top;
   int			width;
   int			height;
+  int			left_trim;
+  int			right_trim;
+  int			top_trim;
+  int			bottom_trim;
   int			adjusted_width;
   int			adjusted_height;
   int			last_percent;
@@ -325,6 +329,7 @@ static stp_vars_t *
 initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 {
   const stp_papersize_t	*size;		/* Paper size */
+  int tmp_left, tmp_right, tmp_top, tmp_bottom, tmp_width, tmp_height;
   stp_vars_t *v = stp_vars_create_copy(default_settings);
 
   stp_set_page_width(v, cups->header.PageSize[0]);
@@ -414,15 +419,78 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 			 &(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);
+
+  tmp_left = cups->header.ImagingBoundingBox[0];
+  tmp_top = cups->header.ImagingBoundingBox[1];
+  tmp_right = cups->header.ImagingBoundingBox[2];
+  tmp_bottom = cups->header.ImagingBoundingBox[3];
+  tmp_width = cups->right - cups->left;
+  tmp_height = cups->bottom - cups->top;
+  if (tmp_left < cups->left)
+    {
+      cups->left_trim = cups->left - tmp_left;
+      fprintf(stderr, "DEBUG: Gutenprint left margin %d\n", cups->left_trim);
+      tmp_left = cups->left;
+    }
+  else
+    {
+      cups->left_trim = 0;
+      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)
+    {
+      cups->right_trim = tmp_right - cups->right;
+      fprintf(stderr, "DEBUG: Gutenprint right margin %d\n", cups->right_trim);
+      tmp_right = cups->right;
+    }
+  else
+    {
+      cups->right_trim = 0;
+      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)
+    {
+      cups->top_trim = cups->top - tmp_top;
+      fprintf(stderr, "DEBUG: Gutenprint top margin %d\n", cups->top_trim);
+      tmp_top = cups->top;
+    }
+  else
+    {
+      cups->top_trim = 0;
+      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)
+    {
+      cups->bottom_trim = tmp_bottom - cups->bottom;
+      fprintf(stderr, "DEBUG: Gutenprint bottom margin %d\n", cups->bottom_trim);
+      tmp_bottom = cups->bottom;
+    }
+  else
+    {
+      cups->bottom_trim = 0;
+      fprintf(stderr, "DEBUG: Gutenprint adjusting bottom margin from %d to %d\n",
+	      cups->bottom, tmp_bottom);
+      cups->bottom = tmp_bottom;
+    }
+
   stp_set_width(v, cups->right - cups->left);
   stp_set_height(v, cups->bottom - cups->top);
   stp_set_left(v, cups->left);
   stp_set_top(v, cups->top);
+
   cups->right = cups->width - cups->right;
   cups->width = cups->width - cups->left - cups->right;
   cups->width = cups->header.HWResolution[0] * cups->width / 72;
   cups->left = cups->header.HWResolution[0] * cups->left / 72;
   cups->right = cups->header.HWResolution[0] * cups->right / 72;
+  cups->left_trim = cups->header.HWResolution[0] * cups->left_trim / 72;
+  cups->right_trim = cups->header.HWResolution[0] * cups->right_trim / 72;
   cups->adjusted_width = cups->width;
   if (cups->adjusted_width > cups->header.cupsWidth)
     cups->adjusted_width = cups->header.cupsWidth;
@@ -432,6 +500,8 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   cups->height = cups->header.HWResolution[1] * cups->height / 72;
   cups->top = cups->header.HWResolution[1] * cups->top / 72;
   cups->bottom = cups->header.HWResolution[1] * cups->bottom / 72;
+  cups->top_trim = cups->header.HWResolution[1] * cups->top_trim / 72;
+  cups->bottom_trim = cups->header.HWResolution[1] * cups->bottom_trim / 72;
   cups->adjusted_height = cups->height;
   if (cups->adjusted_height > cups->header.cupsHeight)
     cups->adjusted_height = cups->header.cupsHeight;
@@ -659,7 +729,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     return (1);
   }
   else if (strcmp(ppd->nickname + strlen(ppd->modelname) +
-		  strlen(CUPS_PPD_NICKNAME_STRING), version_id) != 0)
+		  strlen(CUPS_PPD_NICKNAME_STRING), version_id) != 0 &&
+	   (strlen(ppd->nickname + strlen(ppd->modelname) +
+		   strlen(CUPS_PPD_NICKNAME_STRING)) < strlen(version_id) ||
+	    !((strncmp(ppd->nickname + strlen(ppd->modelname) +
+		      strlen(CUPS_PPD_NICKNAME_STRING), version_id,
+		      strlen(version_id)) == 0) &&
+	      *(ppd->nickname + strlen(ppd->modelname) +
+		strlen(CUPS_PPD_NICKNAME_STRING)) != ' ')))
   {
     fprintf(stderr, "ERROR: Gutenprint: The version of Gutenprint software installed (%s) does not match the PPD file (%s).\n",
 	    version_id,
@@ -943,6 +1020,7 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
   unsigned char *orig = data;           /* Temporary pointer */
   static int warned = 0;                /* Error warning printed? */
   int new_percent;
+  int left_margin, right_margin;
 
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     {
@@ -952,7 +1030,13 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
   bytes_per_line =
     ((cups->adjusted_width * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
     CHAR_BIT;
-  margin = cups->header.cupsBytesPerLine - bytes_per_line;
+
+  left_margin = ((cups->left_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
+    CHAR_BIT; 
+  right_margin = ((cups->right_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
+    CHAR_BIT; 
+  margin = cups->header.cupsBytesPerLine - left_margin - bytes_per_line -
+    right_margin;
 
   if (cups->row < cups->header.cupsHeight)
   {
@@ -960,12 +1044,19 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	    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);
+	    throwaway_data(left_margin, cups);
+	  }
 	cupsRasterReadPixels(cups->ras, data, bytes_per_line);
 	cups->row ++;
-	if (margin > 0)
+	if (margin + right_margin > 0)
 	  {
-	    fprintf(stderr, "DEBUG2: Gutenprint tossing right %d\n", margin);
-	    throwaway_data(margin, cups);
+	    fprintf(stderr, "DEBUG2: Gutenprint tossing right %d (%d) + %d\n",
+		    right_margin, cups->right_trim, margin);
+	    throwaway_data(margin + right_margin, cups);
 	  }
       }
   }
@@ -1001,7 +1092,7 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
       if (warned == 0)
 	{
 	  fprintf(stderr,
-		  "WARNING: Gutenprint detected broken job options.  "
+		  "WARNING: Gutenprint detected bad CUPS bit depth (1).  "
 		  "Output quality is degraded.  Are you using psnup or non-ADSC PostScript?\n");
 	  warned = 1;
 	}
@@ -1098,5 +1189,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.99 2006/04/17 02:06:18 rlk Exp $".
  */
diff --git a/src/cups/test-ppds b/src/cups/test-ppds
new file mode 100755
index 0000000..050906a
--- /dev/null
+++ b/src/cups/test-ppds
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+status=0
+verbose=0
+strict=0
+
+usage() {
+    echo "Usage: run-testpattern [-v] [-s]"
+    exit
+}
+
+set_args() {
+    while true ; do
+	case "$1" in
+	    -h*|--h*) usage ;;
+	    -v) verbose=1 ;;
+	    -s) strict=1 ;;
+	    --) shift; args="$@"; return ;;
+	    *) return ;;
+	esac
+    shift
+    done
+}
+
+set_args `getopt vhs "$@"`
+
+
+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
+fi
+
+exit $status
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 4ba8eb2..8158d09 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -262,6 +265,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -585,9 +589,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 3ae79a2..5525abd 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -177,10 +177,88 @@ static errorMessage_t errorMessage[] =
                                 sig = signal(SIGALRM, sigAlarm); \
                               }
 
+/*******************************************************************/
+/* Function printHexValues                                         */
+/*                                                                 */
+/* Print hex code contained in the passed buffer                   */
+/*                                                                 */
+/*******************************************************************/
+
+static void printHexValues(const char *dir, const unsigned char *buf, int len)
+{
+   int i, j;
+   int printable_count = 0;
+   int longest_printable_run = 0;
+   int current_printable_run = 0;
+   int print_strings = 0;
+   int blocks = (len + 15) / 16;
+#if 0
+   len = len > 30 ? 30 : len;
+#endif
+   fprintf(stderr,"%s\n",dir);
+   for (i = 0; i < len; i++)
+     {
+       if (isprint(buf[i]))
+	 {
+	   if (!isspace(buf[i]))
+	     printable_count++;
+	   current_printable_run++;
+	 }
+       else
+	 {
+	   if (current_printable_run > longest_printable_run)
+	     longest_printable_run = current_printable_run;
+	 }
+     }
+   if (current_printable_run > longest_printable_run)
+     longest_printable_run = current_printable_run;
+   if (longest_printable_run >= 8 ||
+       ((float) printable_count / (float) len > .75))
+     print_strings = 1;
+   if (print_strings)
+     {
+       for (i = 0; i < len; i++)
+	 {
+	   fprintf(stderr,"%c",isprint(buf[i])||isspace(buf[i])?buf[i]:'*');
+	   if (buf[i] == ';' && i < len - 1)
+	     fprintf(stderr, "\n");
+	 }
+       fprintf(stderr, "\n");
+     }
+   for (j = 0; j < blocks; j++)
+     {
+       int baseidx = j * 16;
+       int count = len;
+       if (count > baseidx + 16)
+	 count =  baseidx + 16;
+       fprintf(stderr, "%4d: ", baseidx);
+       for ( i = baseidx; i < count;i++)
+	 {
+	   if (i % 4 == 0)
+	     fprintf(stderr, " ");
+	   fprintf(stderr," %02x",buf[i]);
+	 }
+       if (print_strings)
+	 {
+	   fprintf(stderr,"\n      ");
+	   for ( i = baseidx; i < count;i++)
+	     {
+	       if (i % 4 == 0)
+		 fprintf(stderr, " ");
+	       fprintf(stderr,"  %c",
+		       isprint(buf[i]) && !isspace(buf[i]) ? buf[i] : ' ');
+	     }
+	 }
+       fprintf(stderr, "\n");
+     }
+}
+
 int SafeWrite(int fd, const void *data, int len)
 {
   int status;
   int retries=30;
+  if (debugD4)
+    printHexValues("SafeWrite: ", data, len);
   do
     {
       status = write(fd, data, len);
@@ -193,29 +271,6 @@ int SafeWrite(int fd, const void *data, int len)
 }
 
 /*******************************************************************/
-/* Function printHexValues                                         */
-/*                                                                 */
-/* Print hex code contained in the passed buffer                   */
-/*                                                                 */
-/*******************************************************************/
-
-static void printHexValues(const char *dir, unsigned char *buf, int len)
-{
-   int i;
-#if 0
-   len = len > 30 ? 30 : len;
-#endif
-   fprintf(stderr,"%s",dir);
-   for ( i = 0; i < len;i++)
-      fprintf(stderr,"%02x ",buf[i]);
-   fprintf(stderr,"\n");
-   fprintf(stderr,"      ");
-   for ( i = 0; i < len;i++)
-      fprintf(stderr,"%c  ",isprint(buf[i])&&!isspace(buf[i])?buf[i]:' ');
-   fprintf(stderr,"\n");
-}
-
-/*******************************************************************/
 /* Function sigAlarm(int code)                                     */
 /*                                                                 */
 /* do nothing, avoid printing of undesired messages and/or         */
@@ -233,7 +288,7 @@ static void sigAlarm(int code)
 /* Function printError()                                           */
 /*    print an error message on stderr                             */
 /*                                                                 */
-/* Input:  unsigned char errorNb the error number                             */
+/* Input:  unsigned char errorNb the error number                  */
 /*                                                                 */
 /* Return: fatal = 1 or recoverable = 0                            */
 /*                                                                 */
@@ -324,11 +379,11 @@ static int writeCmd(int fd, unsigned char *cmd, int len)
 # endif
       if ( cmd[0] == 0 && cmd[1] == 0 )
       {
-         printHexValues("Send: ", (unsigned char*)cmd, len);
+         printHexValues("Send: ", cmd, len);
       }
       else
       {
-         printHexValues("Send: ", (unsigned char*)cmd, 6);
+         printHexValues("Send: ", cmd, 6);
       }
    }
 
@@ -389,6 +444,7 @@ int readAnswer(int fd, unsigned char *buf, int len)
    struct itimerval ti, oti;
    long dt;
    int count = 0;
+   int first_read = 1;
    /* wait a little bit before reading an answer */
    usleep(d4RdTimeout);
 
@@ -408,8 +464,20 @@ int readAnswer(int fd, unsigned char *buf, int len)
       SET_TIMER(ti,oti, d4RdTimeout);
       rd = read(fd, buf+total, len-total);
       if (debugD4)
-	fprintf(stderr, "read: %i %s\n", rd,
-		rd < 0 && errno != 0 ?strerror(errno) : "");
+	{
+	  if (first_read)
+	    {
+	      fprintf(stderr, "read: ");
+	      first_read = 0;
+	    }
+	  if (rd < 0)
+	    {
+	      fprintf(stderr, "%i %s\n", rd, errno != 0 ?strerror(errno) : "");
+	      first_read = 1;
+	    }
+	  else
+	    fprintf(stderr, "%i ", rd);
+	}
       RESET_TIMER(ti,oti);
       if ( rd <= 0 )
       {
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 8997a97..0aa46db 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.79 2005/12/31 21:23:08 rlk Exp $"
+ * "$Id: escputil.c,v 1.85 2006/04/16 01:00:51 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/wait.h>
+#include <ctype.h>
 #if defined(HAVE_VARARGS_H) && !defined(HAVE_STDARG_H)
 #include <varargs.h>
 #else
@@ -67,13 +68,13 @@ int do_print_cmd(void);
 
 
 const char *banner = N_("\
-Escputil version " VERSION ", Copyright (C) 2000-2003 Robert Krawitz\n\
+Escputil version " VERSION ", Copyright (C) 2000-2006 Robert Krawitz\n\
 Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n\
 This is free software, and you are welcome to redistribute it\n\
 under certain conditions; type 'escputil -l' for details.\n");
 
 const char *license = N_("\
-Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n\
+Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n\
 \n\
 This program is free software; you can redistribute it and/or modify it\n\
 under the terms of the GNU General Public License as published by the Free\n\
@@ -90,7 +91,7 @@ along with this program; if not, write to the Free Software\n\
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n");
 
 
-#ifdef HAVE_GETOPT_H
+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
 
 struct option optlist[] =
 {
@@ -110,12 +111,15 @@ struct option optlist[] =
   { "license",			0,	NULL,	(int) 'l' },
   { "list-models",		0,	NULL,	(int) 'M' },
   { "short-name",		0,	NULL,	(int) 'S' },
+  { "choices",			0,	NULL,	(int) 'C' },
+  { "patterns",			0,	NULL,	(int) 'p' },
   { NULL,			0,	NULL,	0 	  }
 };
 
 const char *help_msg = N_("\
 Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n\
                 [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n\
+                [-C choices] [-p patterns]\n\
 Perform maintenance on EPSON Stylus (R) printers.\n\
 Examples: escputil --ink-level --raw-device /dev/usb/lp0\n\
           escputil --clean-head --new --printer-name MyQueue\n\
@@ -150,12 +154,15 @@ Examples: escputil --ink-level --raw-device /dev/usb/lp0\n\
                        newer).  Only needed when not using a raw device.\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");
+    -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
 const char *help_msg = N_("\
 Usage: escputil [OPTIONS] [COMMAND]\n\
 Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n\
                 [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n\
+                [-C choices] [-p patterns]\n\
 Perform maintenance on EPSON Stylus (R) printers.\n\
 Examples: escputil -i -r /dev/usb/lp0\n\
           escputil -c -u -P MyQueue\n\
@@ -189,7 +196,9 @@ Examples: escputil -i -r /dev/usb/lp0\n\
           Only needed when not using a raw device.\n\
     -q Suppress the banner.\n\
     -S Print the short name of the printer with -d.\n\
-    -m Specify the precise printer model for head alignment.\n");
+    -m Specify the precise printer model for head alignment.\n\
+    -C Specify the number of pattern choices for alignment\n\
+    -p Specify the number of sets of patterns for alignment\n");
 #endif
 
 char *the_printer = NULL;
@@ -202,6 +211,8 @@ int found_unknown_old_printer = 0;
 int print_short_name = 0;
 const stp_printer_t *the_printer_t = NULL;
 int printer_was_in_packet_mode = 0;
+int alignment_passes = 0;
+int alignment_choices = 0;
 
 static int stp_debug = 0;
 #define STP_DEBUG(x) do { if (stp_debug || getenv("STP_DEBUG")) x; } while (0)
@@ -251,6 +262,7 @@ exit_packet_mode_old(int do_init)
 {
   static char hdr[] = "\000\000\000\033\001@EJL 1284.4\n@EJL     \n\033@";
   memcpy(printer_cmd + bufpos, hdr, sizeof(hdr) - 1); /* DON'T include null! */
+  STP_DEBUG(fprintf(stderr, "Exit packet mode (%d)\n", do_init));
   bufpos += sizeof(hdr) - 1;
   if (!do_init)
     bufpos -= 2;
@@ -260,6 +272,7 @@ static void
 initialize_print_cmd(int do_init)
 {
   bufpos = 0;
+  STP_DEBUG(fprintf(stderr, "Initialize print command\n"));
   if (isnew)
     exit_packet_mode_old(do_init);
 }
@@ -349,6 +362,20 @@ main(int argc, char **argv)
 	case 'S':
 	  print_short_name = 1;
 	  break;
+	case 'C':
+	  alignment_choices = atoi(optarg);
+	  if (alignment_choices < 1)
+	    {
+	      printf(_("Alignment choices must be at least 1."));
+	      do_help(1);
+	    }
+	case 'p':
+	  alignment_passes = atoi(optarg);
+	  if (alignment_passes < 1)
+	    {
+	      printf(_("Alignment passes must be at least 1."));
+	      do_help(1);
+	    }
 	default:
 	  printf("%s\n", _(banner));
 	  fprintf(stderr, _("Unknown option %c\n"), c);
@@ -397,6 +424,24 @@ main(int argc, char **argv)
   exit(0);
 }
 
+void
+print_debug_data(const char *buf, size_t count)
+{
+  int i;
+  for (i = 0; i < count; i++)
+    {
+      if (i % 16 == 0)
+	fprintf(stderr, "\n%4d: ", i);
+      else if (i % 4 == 0)
+	fprintf(stderr, " ");
+      if (isgraph(buf[i]))
+	fprintf(stderr, "  %c", (unsigned) ((unsigned char) buf[i]));
+      else
+	fprintf(stderr, " %02x", (unsigned) ((unsigned char) buf[i]));
+    }
+  fprintf(stderr, "\n");
+}
+
 int
 do_print_cmd(void)
 {
@@ -439,6 +484,9 @@ do_print_cmd(void)
 	  return 1;
 	}
     }
+  STP_DEBUG(fprintf(stderr, "Sending print command to %s:",
+		    raw_device ? raw_device : command));
+  STP_DEBUG(print_debug_data(printer_cmd, bufpos));
   while (bytes < bufpos)
     {
       int status = fwrite(printer_cmd + bytes, 1, bufpos - bytes, pfile);
@@ -509,7 +557,12 @@ read_from_printer(int fd, char *buf, int bufsize, int quiet)
     }
   while ((status == 0) && (--retry != 0));
 
-  if (status == 0 && retry == 0)
+  if (status > 0)
+    {
+      STP_DEBUG(fprintf(stderr, "read_from_printer returns %d\n", status));
+      STP_DEBUG(print_debug_data(buf, status));
+    }
+  else if (status == 0 && retry == 0)
     {
       if (!quiet)
 	fprintf(stderr, _("Read from printer timed out\n"));
@@ -524,26 +577,75 @@ read_from_printer(int fd, char *buf, int bufsize, int quiet)
 }
 
 static void
-do_remote_cmd(const char *cmd, int nargs, ...)
+start_remote_sequence(void)
 {
   static char remote_hdr[] = "\033@\033(R\010\000\000REMOTE1";
+  memcpy(printer_cmd + bufpos, remote_hdr, sizeof(remote_hdr) - 1);
+  bufpos += sizeof(remote_hdr) - 1;
+  STP_DEBUG(fprintf(stderr, "Start remote sequence\n"));
+}
+
+static void
+end_remote_sequence(void)
+{  
   static char remote_trailer[] = "\033\000\000\000\033\000";
+  memcpy(printer_cmd + bufpos, remote_trailer, sizeof(remote_trailer) - 1);
+  bufpos += sizeof(remote_trailer) - 1;
+  STP_DEBUG(fprintf(stderr, "End remote sequence\n"));
+}
+
+static void
+do_remote_cmd(const char *cmd, int nargs, ...)
+{
   int i;
   va_list args;
   va_start(args, nargs);
 
-  memcpy(printer_cmd + bufpos, remote_hdr, sizeof(remote_hdr) - 1);
-  bufpos += sizeof(remote_hdr) - 1;
+  start_remote_sequence();
   memcpy(printer_cmd + bufpos, cmd, 2);
+  STP_DEBUG(fprintf(stderr, "Remote command: %s", cmd));
   bufpos += 2;
   printer_cmd[bufpos] = nargs % 256;
   printer_cmd[bufpos + 1] = (nargs >> 8) % 256;
+  STP_DEBUG(fprintf(stderr, " %02x %02x",
+		    (unsigned) printer_cmd[bufpos],
+		    (unsigned) printer_cmd[bufpos + 1]));
   if (nargs > 0)
     for (i = 0; i < nargs; i++)
-      printer_cmd[bufpos + 2 + i] = va_arg(args, int);
+      {
+	printer_cmd[bufpos + 2 + i] = va_arg(args, int);
+	STP_DEBUG(fprintf(stderr, " %02x",
+			  (unsigned) printer_cmd[bufpos + 2 + i]));
+      }
+  STP_DEBUG(fprintf(stderr, "\n"));
+  bufpos += 2 + nargs;
+  end_remote_sequence();
+}
+
+static void
+do_remote_cmd_only(const char *cmd, int nargs, ...)
+{
+  int i;
+  va_list args;
+  va_start(args, nargs);
+
+  memcpy(printer_cmd + bufpos, cmd, 2);
+  STP_DEBUG(fprintf(stderr, "Remote command: %s", cmd));
+  bufpos += 2;
+  printer_cmd[bufpos] = nargs % 256;
+  printer_cmd[bufpos + 1] = (nargs >> 8) % 256;
+  STP_DEBUG(fprintf(stderr, " %02x %02x",
+		    (unsigned) printer_cmd[bufpos],
+		    (unsigned) printer_cmd[bufpos + 1]));
+  if (nargs > 0)
+    for (i = 0; i < nargs; i++)
+      {
+	printer_cmd[bufpos + 2 + i] = va_arg(args, int);
+	STP_DEBUG(fprintf(stderr, " %02x",
+			  (unsigned) printer_cmd[bufpos + 2 + i]));
+      }
+  STP_DEBUG(fprintf(stderr, "\n"));
   bufpos += 2 + nargs;
-  memcpy(printer_cmd + bufpos, remote_trailer, sizeof(remote_trailer) - 1);
-  bufpos += sizeof(remote_trailer) - 1;
 }
 
 static void
@@ -560,6 +662,7 @@ 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';
@@ -571,6 +674,7 @@ static void
 add_resets(int count)
 {
   int i;
+  STP_DEBUG(fprintf(stderr, "Add %d resets\n", count));
   for (i = 0; i < count; i++)
     {
       printer_cmd[bufpos++] = '\033';
@@ -678,15 +782,16 @@ initialize_printer(int quiet, int fail_if_not_found)
 		      strerror(errno));
 	      exit(1);
 	    }
-	  STP_DEBUG(fprintf(stderr, "Try %d alarm %d\n", tries, alarm_interrupt));
-	  STP_DEBUG(fprintf(stderr, "Reading response of old init command ...\n"));
+	  STP_DEBUG(fprintf(stderr, "Try old command %d alarm %d\n",
+			    tries, alarm_interrupt));
 	  status = read_from_printer(fd, (char*)buf, 1024, 1);
 	  if (status <= 0 && tries > 0)
 	    {
 	      forced_packet_mode = !init_packet(fd, 1);
 	      status = 1;
 	    }
-	  if (status > 0 && !strstr((char *) buf, "@EJL ID") && tries < 1)
+	  if (!forced_packet_mode &&
+	      status > 0 && !strstr((char *) buf, "@EJL ID") && tries < 3)
 	    {
 	      STP_DEBUG(fprintf(stderr, "Found bad data: %s\n", buf));
 	      /*
@@ -709,34 +814,32 @@ initialize_printer(int quiet, int fail_if_not_found)
 	  isnew = 1;
 
 	  credit = askForCredit(fd, socket_id, &send_size, &receive_size);
-	  if ( credit > -1 )
+	  if (credit < 0)
 	    {
-	      /* request status command */
-	      if ( (status = writeData(fd, socket_id, (const unsigned char*)"di\1\0\1", 5, 1)) > 0 )
-		{
-		  do
-		    {
-		      if ( ( status = readData(fd, socket_id, (unsigned char*)buf, 1023) ) <= -1 )
-			{
-			  return NULL;
-			}
-		      STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
-		    }
-		  while ( (retry-- != 0) && strncmp("di", (char*)buf, 2) && strncmp("@EJL ID", (char*)buf, 7));
-		  if (!retry)
-		    {
-		      return NULL;
-		    }
-		}
-	      else /* could not write */
-		{
-		  fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
-		  return NULL;
-		}
+	      STP_DEBUG(fprintf(stderr, "Cannot get credit\n"));
+	      return NULL;
+	    }
+	  /* request status command */
+	  status = writeData(fd, socket_id, (const unsigned char*)"di\1\0\1",
+			     5, 1);
+	  if (status <= 0)
+	    {
+	      fprintf(stderr, _("\nCannot write to %s: %s\n"),
+		      raw_device, strerror(errno));
+	      return NULL;
 	    }
-	  else /* no credit */
+	  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));
+	    }
+	  while ( (retry-- != 0) && strncmp("di", (char*)buf, 2) &&
+		  strncmp("@EJL ID", (char*)buf, 7));
+	  if (!retry)
 	    {
-	      STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n")));
 	      return NULL;
 	    }
 	}
@@ -763,8 +866,8 @@ initialize_printer(int quiet, int fail_if_not_found)
 	    {
 	      if (!quiet && fail_if_not_found)
 		{
-		  printf(_("\nCannot detect printer type.\n"
-			   "Please use -m to specify your printer model.\n"));
+		  fprintf(stderr, _("\nCannot detect printer type.\n"
+				    "Please use -m to specify your printer model.\n"));
 		  do_help(1);
 		}
 	      /*
@@ -782,8 +885,7 @@ initialize_printer(int quiet, int fail_if_not_found)
 		   * However, make it clear that this is a dummy,
 		   * so we don't actually try to print it out.
 		   */
-		  STP_DEBUG(fprintf(stderr,
-				    "Can't find printer name, assuming Stylus Photo\n"));
+		  STP_DEBUG(fprintf(stderr, "Can't find printer name, assuming Stylus Photo\n"));
 		  printer_model = c_strdup("escp2-photo");
 		}
 	      else
@@ -812,8 +914,8 @@ initialize_printer(int quiet, int fail_if_not_found)
 	      !strcasecmp(printer_model, long_name) ||
 	      (!strncmp(short_name, "escp2-", strlen("escp2-")) &&
 	       !strcasecmp(printer_model, short_name + strlen("escp2-"))) ||
-	      (!strncmp(long_name, "EPSON ", strlen("EPSON ")) &&
-	       !strcasecmp(printer_model, long_name + strlen("EPSON "))))
+	      (!strncasecmp(long_name, "Epson ", strlen("Epson ")) &&
+	       !strcasecmp(printer_model, long_name + strlen("Epson "))))
 	    {
 	      const stp_vars_t *printvars;
 	      stp_parameter_t desc;
@@ -901,6 +1003,319 @@ static const char *aux_colors[] =
 static int aux_color_count = sizeof(aux_colors) / sizeof(const char *);
 
 static void
+print_status(int param)
+{
+  switch (param)
+    {
+    case 0:
+      printf(_("Status: Error\n"));
+      break;
+    case 1:
+      printf(_("Status: Self-Printing\n"));
+      break;
+    case 2:
+      printf(_("Status: Busy\n"));
+      break;
+    case 3:
+      printf(_("Status: Waiting\n"));
+      break;
+    case 4:
+      printf(_("Status: Idle\n"));
+      break;
+    case 5:
+      printf(_("Status: Paused\n"));
+      break;
+    case 7:
+      printf(_("Status: Cleaning\n"));
+      break;
+    case 8:
+      printf(_("Status: Factory shipment\n"));
+      break;
+    case 0xa:
+      printf(_("Status: Shutting down\n"));
+      break;
+    default:
+      printf(_("Status: Unknown (%d)\n"), param);
+      break;
+    }
+}
+
+static void
+print_error(int param)
+{
+  switch (param)
+    {
+    case 0:
+      printf(_("Error: Fatal Error\n"));
+      break;
+    case 1:
+      printf(_("Error: Other interface is selected\n"));
+      break;
+    case 2:
+      printf(_("Error: Cover Open\n"));
+      break;
+    case 4:
+      printf(_("Error: Paper jam\n"));
+      break;
+    case 5:
+      printf(_("Error: Ink out\n"));
+      break;
+    case 6:
+      printf(_("Error: Paper out\n"));
+      break;
+    case 0x11:
+      printf(_("Error: Wait return from the tear-off position\n"));
+      break;
+    case 0x12:
+      printf(_("Error: Double feed error\n"));
+      break;
+    case 0x1c:
+      printf(_("Error: Unrecoverable cutter error\n"));
+      break;
+    case 0x1d:
+      printf(_("Error: Recoverable cutter jam\n"));
+      break;
+    case 0x29:
+      printf(_("Error: CD Tray Out\n"));
+      break;
+    case 0x2a:
+      printf(_("Error: Card loading error\n"));
+      break;
+    case 0x2b:
+      printf(_("Error: Tray cover open\n"));
+      break;
+    default:
+      printf(_("Error: Unknown (%d)\n"), param);
+      break;
+    }
+}
+
+static void
+print_self_printing_state(int param)
+{
+  switch (param)
+    {
+    case 0:
+      printf(_("Printing nozzle self-test\n"));
+      break;
+    default:
+      break;
+    }
+}
+
+static const char *
+looking_at_command(const char *buf, const char *cmd)
+{
+  if (!strncmp(buf, cmd, strlen(cmd)))
+    {
+      const char *answer = buf + strlen(cmd);
+      if (answer[0] == ':')
+	return (answer + 1);
+    }
+  return NULL;
+}
+
+static const char *
+find_group(const char *buf)
+{
+  while (buf[0] == ';')
+    buf++;
+  buf = strchr(buf, ';');
+  if (buf && buf[1])
+    return buf + 1;
+  else
+    return NULL;
+}
+
+static int
+get_digit(char digit)
+{
+  if (digit >= '0' && digit <= '9')
+    return digit - '0';
+  else if (digit >= 'A' && digit <= 'F')
+    return digit - 'A' + 10;
+  else if (digit >= 'a' && digit <= 'f')
+    return digit - 'a' + 10;
+  else
+    return 0;
+}
+
+static void
+print_old_ink_levels(const char *ind, stp_string_list_t *color_list)
+{
+  int i;
+  for (i = 0; i < stp_string_list_count(color_list); i++)
+    {
+      int val;
+      if (!ind[0] || ind[0] == ';')
+	return;
+      val = (get_digit(ind[0]) << 4) + get_digit(ind[1]);
+      printf("%18s    %20d\n",
+	     _(stp_string_list_param(color_list, i)->text), val);
+      ind += 2;
+    }
+}
+
+static void
+do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer)
+{
+  do
+    {
+      const char *ind;
+      if (cmd == CMD_STATUS && (ind = looking_at_command(buf, "ST")) != 0)
+	print_status(atoi(ind));
+      else if (cmd == CMD_STATUS &&
+	       (ind = looking_at_command(buf, "ER")) != 0)
+	print_error(atoi(ind));
+      else if ((ind = looking_at_command(buf, "IQ")) != 0)
+	{
+	  stp_string_list_t *color_list = NULL;
+	  if (printer)
+	    {
+	      stp_parameter_t desc;
+	      const stp_vars_t *printvars = stp_printer_get_defaults(printer);
+	      stp_describe_parameter(printvars, "ChannelNames", &desc);
+	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+		{
+		  color_list = stp_string_list_create_copy(desc.bounds.str);
+		  STP_DEBUG(fprintf(stderr,
+				    "Using color list from driver (%d %d)\n",
+				    stp_string_list_count(desc.bounds.str),
+				    stp_string_list_count(color_list)));
+		  stp_parameter_description_destroy(&desc);
+		}
+	    }
+	  if (!color_list)/* use defaults */
+	    {
+	      stp_string_list_add_string(color_list, "Black", _("Black"));
+	      stp_string_list_add_string(color_list, "Cyan", _("Cyan"));
+	      stp_string_list_add_string(color_list, "Magenta", _("Magenta"));
+	      stp_string_list_add_string(color_list, "Yellow", _("Yellow"));
+	      stp_string_list_add_string(color_list, "LightCyan", _("Light Cyan"));
+	      stp_string_list_add_string(color_list, "LightMagenta", _("Light Magenta"));
+	    }	  
+	  
+	  if (cmd == CMD_STATUS)
+	    printf(_("Ink Levels:\n"));
+	  printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
+	  print_old_ink_levels(ind, color_list);
+	  stp_string_list_destroy(color_list);
+	  if (cmd == CMD_STATUS)
+	    printf("\n");
+	}
+      STP_DEBUG(fprintf(stderr, "looking at %s\n", buf));
+    } while ((buf = find_group(buf)) != NULL);
+}  
+
+static void
+do_new_status(status_cmd_t cmd, char *buf, int bytes,
+	      const stp_printer_t *printer)
+{
+  int i = 0;
+  int j;
+  const char *ind;
+  STP_DEBUG(fprintf(stderr, "New format bytes: %d bytes\n", bytes));
+  while (i < bytes)
+    {
+      unsigned hdr = buf[i];
+      unsigned total_param_count = buf[i + 1];
+      unsigned param = buf[i + 2];
+      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;
+	  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)
+		printf("%18s    %20d\n",
+		       _(colors_new[(int) ind[0]]), ind[2]);
+	      else if (ind[j] == 0x40 && ind[1] < aux_color_count)
+		printf("%18s    %20d\n",
+		       _(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;
+	    }
+	  if (cmd == CMD_STATUS)
+	    printf("\n");
+	}
+      else if (cmd == CMD_STATUS)
+	{
+	  switch (hdr)
+	    {
+	    case 0x1:	/* Status */
+	      print_status(param);
+	      break;
+	    case 0x2:	/* Error */
+	      print_error(param);
+	      break;
+	    case 0x3:	/* Self-printing */
+	      print_self_printing_state(param);
+	      break; 
+	    case 0x4:	/* Warning */
+#if 0
+	      /*
+	       * Bits mean different things on different printers
+	       * Need to figure out how to do this...
+	       * Maybe we don't really need to, since we're also
+	       * printing out ink levels
+	       */
+	      for (j = 0; j < total_param_count; i++)
+		{
+		  param = (unsigned) buf[i + j + 2];
+		  switch (param)
+		    {
+		    case 0x10:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    case 0x11:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    case 0x12:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    case 0x13:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    case 0x14:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    case 0x15:
+		      printf(_("Warning: Black Ink Low\n"));
+		      break;
+		    default:
+		      printf(_("Warning: Unknown (%d)\n"), param);
+		      break;
+		    }
+		}
+#endif
+	      break;
+	    case 0x19:	/* Job name */
+	      if (total_param_count > 5)
+		{
+		  printf(_("Job Name: "));
+		  for (j = 5; j < total_param_count; j++)
+		    putchar(buf[i + j + 2]);
+		  putchar('\n');
+		}
+	      break;
+	    default:
+	      /* Ignore other commands */
+	      break;
+	    }
+	}
+      i += total_param_count + 2;
+    }
+  exit(0);
+}
+
+static void
 do_status_command_internal(status_cmd_t cmd)
 {
   int fd;
@@ -908,9 +1323,6 @@ do_status_command_internal(status_cmd_t cmd)
   int credit;
   int retry = 4;
   char buf[1024];
-  char *ind = NULL;
-  char *oind;
-  int i;
   const stp_printer_t *printer;
   const char *cmd_name = NULL;
   switch (cmd)
@@ -932,7 +1344,7 @@ do_status_command_internal(status_cmd_t cmd)
   STP_DEBUG(fprintf(stderr, "%s...\n", cmd_name));
   printer = get_printer(1, 0);
   if (!found_unknown_old_printer)
-    STP_DEBUG(fprintf(stderr, "%s found %s%s\n", cmd_name,
+    STP_DEBUG(fprintf(stderr, "%s found %s%s\n", _(cmd_name),
 		      printer ? stp_printer_get_long_name(printer) :
 		      printer_model,
 		      printer ? "" : "(Unknown model)"));
@@ -948,84 +1360,40 @@ do_status_command_internal(status_cmd_t cmd)
   if (isnew)
     {
       credit = askForCredit(fd, socket_id, &send_size, &receive_size);
-      if ( credit > -1 )
+      if (credit < 0)
         {
-          /* request status command */
-          if ( (status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1", 5, 1)) > 0 )
-            {
-              do
-                {
-                  if ( ( status = readData(fd, socket_id, (unsigned char*)buf, 1023) ) <= -1 )
-                    {
-                      exit(1);
-                    }
-		  STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
-                }
-              while ( (retry-- != 0) && strncmp("st", buf, 2) && strncmp("@BDC ST", buf, 7) );
-	      /* "@BCD ST ST"  found */
-	      if (!retry)
-		{
-		  exit(1);
-		}
-	      buf[status] = '\0';
-	      if (cmd == CMD_INK_LEVEL)
-		{
-		  if ( buf[7] == '2' )
-		    {
-		      STP_DEBUG(fprintf(stderr, "New format ink!\n"));
-		      /* new binary format ! */
-		      i = 10;
-		      while (buf[i] != 0x0f && i < status)
-			i += buf[i + 1] + 2;
-		      ind = buf + i;
-		      i = 3;
-		      printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
-		      while (i < ind[1])
-			{
-			  if (ind[i] < color_count)
-			    printf("%18s    %20d\n", _(colors_new[(int) ind[i]]), ind[i + 2]);
-			  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
-			    printf("%18s    %20d\n", _(aux_colors[(int) ind[i + 1]]), ind[i + 2]);
-			  else
-			    printf("%8s 0x%2x 0x%2x    %20d\n", _("Unknown"), (unsigned char) ind[i], (unsigned char) ind[i + 1], ind[i + 2]);
-			  i+=3;
-			}
-		      ind = NULL;
-		      exit(0);
-		    }
-		  else
-		    /* old format */
-		    {
-		      STP_DEBUG(fprintf(stderr, "Old format ink!\n"));
-		      buf[status] = '\0';
-		      ind = buf;
-		      do
-			{
-			  oind = ind;
-			  ind = strchr(ind, 'I');
-			}
-		      while (ind && oind != ind && ind[1] != 'Q' && (ind[1] != '\0' && ind[2] != ':'));
-		      if (!ind || ind[1] != 'Q' || ind[2] != ':' || ind[3] == ';')
-			{
-			  ind = NULL;
-			}
-		    }
-		}
-	      else
-		ind = buf;
-	      CloseChannel(fd, socket_id);
-            }
-          else /* could not write */
-            {
-              fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
-              exit(1);
-            }
-        }
-      else /* no credit */
-        {
-          STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n")));
+          STP_DEBUG(fprintf(stderr, "\nCannot get credit\n"));
           exit(1);
         }
+      /* request status command */
+      status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1",
+			 5, 1);
+      if (status <= 0)
+	{
+	  fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
+	  exit(1);
+	}
+      do
+	{
+	  status = readData(fd, socket_id, (unsigned char*)buf, 1023);
+	  if (status < 0)
+	    {
+	      exit(1);
+	    }
+	  STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
+	} while ((retry-- != 0) && strncmp("st", buf, 2) &&
+		 strncmp("@BDC ST", buf, 7));
+      /* "@BCD ST ST"  found */
+      if (!retry)
+	{
+	  exit(1);
+	}
+      buf[status] = '\0';
+      if (buf[7] == '2')
+	do_new_status(cmd, buf + 12, status - 12, printer);
+      else
+	do_old_status(cmd, buf + 9, printer);
+      CloseChannel(fd, socket_id);
     }
   else
     {
@@ -1046,71 +1414,10 @@ do_status_command_internal(status_cmd_t cmd)
             {
               exit(1);
             }
-          ind = buf;
-	  if (cmd == CMD_INK_LEVEL)
-	    {
-	      do
-		{
-		  oind = ind;
-		  ind = strchr(ind, 'I');
-		}
-	      while (ind && oind != ind && ind[1] != 'Q' && (ind[1] != '\0' && ind[2] != ':'));
-	      if (!ind || ind[1] != 'Q' || ind[2] != ':' || ind[3] == ';')
-		{
-		  ind = NULL;
-		}
-	    }
-	} while (--retry != 0 && !ind);
-    }
-
-  if (!ind)
-    {
-      exit(1);
-    }
-
-  if (cmd == CMD_INK_LEVEL)
-    {
-      stp_parameter_t desc;
-      const stp_vars_t *printvars;
-      printvars = stp_printer_get_defaults(printer);
-      stp_describe_parameter(printvars, "ChannelNames", &desc);
-      if (desc.p_type != STP_PARAMETER_TYPE_STRING_LIST)
-	{
-	  fprintf(stderr, _("Printer does not support listing ink types!\n"));
-	  exit(1);
-	}
-      ind += 3;
-
-      printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
-      for (i = 0; i < stp_string_list_count(desc.bounds.str); i++)
-	{
-	  int val, j;
-	  if (!ind[0] || ind[0] == ';')
-	    exit(0);
-	  for (j = 0; j < 2; j++)
-	    {
-	      if (ind[j] >= '0' && ind[j] <= '9')
-		ind[j] -= '0';
-	      else if (ind[j] >= 'A' && ind[j] <= 'F')
-		ind[j] = ind[j] - 'A' + 10;
-	      else if (ind[j] >= 'a' && ind[j] <= 'f')
-		ind[j] = ind[j] - 'a' + 10;
-	      else
-		exit(1);
-	    }
-	  val = (ind[0] << 4) + ind[1];
-	  printf("%18s    %20d\n",_(stp_string_list_param(desc.bounds.str, i)->text),
-		 val);
-	  ind += 2;
-	}
-      stp_parameter_description_destroy(&desc);
-    }
-  else
-    {
-      char *where;
-      while ((where = strchr(ind, ';')) != NULL)
-	*where = '\n';
-      printf("%s\n", ind);
+	} while (--retry != 0 && !status);
+      buf[status] = '\0';
+      if (status > 9)
+	do_old_status(cmd, buf + 9, printer);
     }
   (void) close(fd);
   exit(0);
@@ -1152,8 +1459,9 @@ do_extended_ink_info(int extended_output)
       stp_describe_parameter(printvars, "ChannelNames", &desc);
     }
   else
-    printf("Warning! Printer %s is not known; information may be incomplete or incorrect\n",
-	   printer_model);
+    fprintf(stderr,
+	    "Warning! Printer %s is not known; information may be incomplete or incorrect\n",
+	    printer_model);
 
   fd = open(raw_device, O_RDWR, 0666);
   if (fd == -1)
@@ -1167,7 +1475,15 @@ do_extended_ink_info(int extended_output)
     {
       stp_string_list_t *color_list = stp_string_list_create();
 
-      if (!printer)
+      if (printer)
+	{
+	  color_list = stp_string_list_create_copy(desc.bounds.str);
+	  STP_DEBUG(fprintf(stderr, "Using color list from driver (%d %d)\n",
+			    stp_string_list_count(desc.bounds.str),
+			    stp_string_list_count(color_list)));
+	  stp_parameter_description_destroy(&desc);
+	}
+      else
 	{
 	  /*
 	   * If we're using the "new" ink status format and we don't know
@@ -1176,180 +1492,164 @@ do_extended_ink_info(int extended_output)
 	   * last chance to determine the inks
 	   */
 	  credit = askForCredit(fd, socket_id, &send_size, &receive_size);
-	  if ( credit > -1 )
+	  if (credit < 0)
 	    {
-	      /* request status command */
-	      if ( (status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1", 5, 1)) > 0 )
-		{
-		  do
-		    {
-		      if ((status = readData(fd, socket_id, (unsigned char*)buf, 1023)) <= -1)
-			{
-			  stp_parameter_description_destroy(&desc);
-			  exit(1);
-			}
-		      STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
-		    }
-		  while ( (retry-- != 0) && strncmp("st", buf, 2) && strncmp("@BDC ST", buf, 7) );
-		  /* "@BCD ST ST"  found */
-		  if (!retry)
-		    {
-		      stp_parameter_description_destroy(&desc);
-		      exit(1);
-		    }
-		  buf[status] = '\0';
-		  if ( buf[7] == '2' )
-		    {
-		      STP_DEBUG(fprintf(stderr, "New format ink!\n"));
-		      /* new binary format ! */
-		      i = 10;
-		      while (buf[i] != 0x0f && i < status)
-			i += buf[i + 1] + 2;
-		      ind = buf + i;
-		      i = 3;
-		      while (i < ind[1])
-			{
-			  if (ind[i] < color_count)
-			    stp_string_list_add_string(color_list,
-						       colors_new[(int) ind[i]],
-						       colors_new[(int) ind[i]]);
-			  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
-			    stp_string_list_add_string(color_list,
-						       aux_colors[(int) ind[i + 1]],
-						       aux_colors[(int) ind[i + 1]]);
-			  else
-			    stp_string_list_add_string(color_list, "Unknown",
-						       "Unknown");
-			  i+=3;
-			}
-		    }
-		}
-	      else /* could not write */
+	      stp_parameter_description_destroy(&desc);
+	      STP_DEBUG(fprintf(stderr, "Cannot get credit\n"));
+	      exit(1);
+	    }
+	  /* request status command */
+	  status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1",
+			     5, 1);
+	  if (status <= 0)
+	    {
+	      stp_parameter_description_destroy(&desc);
+	      fprintf(stderr, _("\nCannot write to %s: %s\n"),
+		      raw_device, strerror(errno));
+	      exit(1);
+	    }
+	  do
+	    {
+	      status = readData(fd, socket_id, (unsigned char*)buf, 1023);
+	      if (status < 0)
 		{
 		  stp_parameter_description_destroy(&desc);
-		  fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
 		  exit(1);
 		}
+	      STP_DEBUG(fprintf(stderr, "readData try %d status %d\n",
+				retry, status));
 	    }
-	  else /* no credit */
+	  while ((retry-- != 0) && strncmp("st", buf, 2) &&
+		 strncmp("@BDC ST", buf, 7));
+	  /* "@BCD ST ST"  found */
+	  if (!retry)
 	    {
 	      stp_parameter_description_destroy(&desc);
-	      STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n")));
 	      exit(1);
 	    }
+	  buf[status] = '\0';
+	  if ( buf[7] == '2' )
+	    {
+	      STP_DEBUG(fprintf(stderr, "New format ink!\n"));
+	      /* new binary format ! */
+	      i = 10;
+	      while (buf[i] != 0x0f && i < status)
+		i += buf[i + 1] + 2;
+	      ind = buf + i;
+	      i = 3;
+	      while (i < ind[1])
+		{
+		  if (ind[i] < color_count)
+		    stp_string_list_add_string(color_list,
+					       colors_new[(int) ind[i]],
+					       colors_new[(int) ind[i]]);
+		  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
+		    stp_string_list_add_string(color_list,
+					       aux_colors[(int) ind[i + 1]],
+					       aux_colors[(int) ind[i + 1]]);
+		  else
+		    stp_string_list_add_string(color_list, "Unknown",
+					       "Unknown");
+		  i+=3;
+		}
+	    }
 	  STP_DEBUG(fprintf(stderr, "Using color list from status message\n"));
 	}
-      else
-	{
-	  color_list = stp_string_list_create_copy(desc.bounds.str);
-	  STP_DEBUG(fprintf(stderr, "Using color list from driver (%d %d)\n",
-			    stp_string_list_count(desc.bounds.str),
-			    stp_string_list_count(color_list)));
-	  stp_parameter_description_destroy(&desc);
-	}
+
       for (i = 0; i < stp_string_list_count(color_list); i++)
         {
+	  char req[] = "ii\2\0\1\1";
           credit = askForCredit(fd, socket_id, &send_size, &receive_size);
-          if ( credit > -1 )
-            {
-              char req[] = "ii\2\0\1\1";
-              req[5] = i + 1;
-              /* request status command */
-              if ( (status = writeData(fd, socket_id, (const unsigned char*)req, 6, 1)) > 0 )
-                {
-                  retry = 4;
-                  do
-                    {
-                      if ( ( status = readData(fd, socket_id, (unsigned char*) buf, 1023) ) <= -1 )
-                        {
-                          exit(1);
-                        }
-                    } while ((retry-- != 0) && strncmp("ii", buf, 2) && strncmp("@BDC PS", buf, 7));
-                  if (!retry) /* couldn't read answer */
-                    {
-                      exit(1);
-                    }
-                  ind = strchr(buf, 'I');
-		  if (!ind)
-		    printf("Cannot identify cartridge in slot %d\n", i);
-		  else if (sscanf(ind,
-				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
-				  &iv[0], &year, &month, &id,
-				  &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
-				  &year2, &month2, &id2) == 12 ||
-			   sscanf(ind,
-				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
-				  &iv[0], &year, &month, &id,
-				  &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
-				  &year2, &month2, &id2) == 12)
-		    {
-		      int j;
-		      printf("%18s    %20s   %12s   %7s\n",
-			     _("Ink color"), _("Percent remaining"), _("Part number"),
-			     _("Date"));
-                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(color_list, 0)->text),
-                             iv[0], id, (year > 80 ? 19 : 20), year, month);
-		      for (j = 1; j < 6; j++)
-                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(color_list, j)->text),
-                             iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
-		      break;
-		    }
-		  else if (sscanf(ind,
-				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
-				  &iv[0], &year, &month, &id,
-				  &iv[1], &iv[2], &iv[3],
-				  &year2, &month2, &id2) == 10 ||
-			   sscanf(ind,
-				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
-				  &iv[0], &year, &month, &id,
-				  &iv[1], &iv[2], &iv[3],
-				  &year2, &month2, &id2) == 10)
-		    {
-		      int j;
-		      printf("%18s    %20s   %12s   %7s\n",
-			     _("Ink color"), _("Percent remaining"), _("Part number"),
-			     _("Date"));
-                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(color_list, 0)->text),
-                             iv[0], id, (year > 80 ? 19 : 20), year, month);
-		      for (j = 1; j < 4; j++)
-                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(color_list, j)->text),
-                             iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
-		      break;
-		    }
-                  else if (sscanf(ind,
-                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
-                             &val, &year, &month, &id ) == 4 ||
-			   sscanf(ind,
-                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
-                             &val, &year, &month, &id ) == 4)
-                    {
-                      if (i == 0)
-                        printf("%18s    %20s   %12s   %7s\n",
-                               _("Ink color"), _("Percent remaining"), _("Part number"),
-                               _("Date"));
-                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(color_list, i)->text),
-                             val, id, (year > 80 ? 19 : 20), year, month);
-                    }
-		  else
-		    {
-		      printf("Cannot identify cartridge in slot %d\n", i);
-		    }
-                }
-              else /* could not write */
-                {
-                  exit(1);
-                }
-            }
-          else /* no credit */
-            {
-              exit(1);
-            }
-        }
+	  if (credit < 0)
+	    exit(1);
+	  req[5] = i + 1;
+	  /* request status command */
+	  status = writeData(fd, socket_id, (const unsigned char*)req, 6, 1);
+	  if (status <= 0)
+	    exit(1);
+	  retry = 4;
+	  do
+	    {
+	      status = readData(fd, socket_id, (unsigned char*) buf, 1023);
+	      if (status < 0)
+		{
+		  exit(1);
+		}
+	    } while ((retry-- != 0) && strncmp("ii", buf, 2) &&
+		     strncmp("@BDC PS", buf, 7));
+	  if (!retry) /* couldn't read answer */
+	    exit(1);
+	  ind = strchr(buf, 'I');
+	  if (!ind)
+	    printf("Cannot identify cartridge in slot %d\n", i);
+	  else if (sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+			  &iv[0], &year, &month, &id,
+			  &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
+			  &year2, &month2, &id2) == 12 ||
+		   sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+			  &iv[0], &year, &month, &id,
+			  &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
+			  &year2, &month2, &id2) == 12)
+	    {
+	      int j;
+	      printf("%18s    %20s   %12s   %7s\n",
+		     _("Ink color"), _("Percent remaining"), _("Part number"),
+		     _("Date"));
+	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+		     _(stp_string_list_param(color_list, 0)->text),
+		     iv[0], id, (year > 80 ? 19 : 20), year, month);
+	      for (j = 1; j < 6; j++)
+		printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+		       _(stp_string_list_param(color_list, j)->text),
+		       iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
+	      break;
+	    }
+	  else if (sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+			  &iv[0], &year, &month, &id,
+			  &iv[1], &iv[2], &iv[3],
+			  &year2, &month2, &id2) == 10 ||
+		   sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+			  &iv[0], &year, &month, &id,
+			  &iv[1], &iv[2], &iv[3],
+			  &year2, &month2, &id2) == 10)
+	    {
+	      int j;
+	      printf("%18s    %20s   %12s   %7s\n",
+		     _("Ink color"), _("Percent remaining"), _("Part number"),
+		     _("Date"));
+	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+		     _(stp_string_list_param(color_list, 0)->text),
+		     iv[0], id, (year > 80 ? 19 : 20), year, month);
+	      for (j = 1; j < 4; j++)
+		printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+		       _(stp_string_list_param(color_list, j)->text),
+		       iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
+	      break;
+	    }
+	  else if (sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+			  &val, &year, &month, &id ) == 4 ||
+		   sscanf(ind,
+			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+			  &val, &year, &month, &id ) == 4)
+	    {
+	      if (i == 0)
+		printf("%18s    %20s   %12s   %7s\n",
+		       _("Ink color"), _("Percent remaining"), _("Part number"),
+		       _("Date"));
+	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+		     _(stp_string_list_param(color_list, i)->text),
+		     val, id, (year > 80 ? 19 : 20), year, month);
+	    }
+	  else
+	    {
+	      printf("Cannot identify cartridge in slot %d\n", i);
+	    }
+	}
       stp_string_list_destroy(color_list);
       CloseChannel(fd, socket_id);
     }
@@ -1404,6 +1704,7 @@ do_head_clean(void)
 {
   if (raw_device)
     (void) get_printer(1, 0);
+  initialize_print_cmd(1);
   do_remote_cmd("CH", 2, 0, 0);
   printf(_("Cleaning heads...\n"));
   exit(do_print_cmd());
@@ -1414,8 +1715,12 @@ do_nozzle_check(void)
 {
   if (raw_device)
     (void) get_printer(1, 0);
-  do_remote_cmd("VI", 2, 0, 0);
-  do_remote_cmd("NC", 2, 0, 0);
+  initialize_print_cmd(1);
+  start_remote_sequence();
+  do_remote_cmd_only("VI", 2, 0, 0);
+  do_remote_cmd_only("NC", 2, 0, 0x10);
+  do_remote_cmd_only("NC", 2, 0, 0);
+  end_remote_sequence();
   printf(_("Running nozzle check, please ensure paper is in the printer.\n"));
   exit(do_print_cmd());
 }
@@ -1506,9 +1811,16 @@ printer_error(void)
 static int
 do_final_alignment(void)
 {
+  int retry_count = 0;
   while (1)
     {
       char *inbuf;
+      retry_count++;
+      if (retry_count > 10)
+	{
+	  printf(_("Exiting\n"));
+	  exit(1);
+	}
       printf(_("Please inspect the final output very carefully to ensure that your\n"
 	       "printer is in proper alignment. You may now:\n"
 	       "  (s)ave the results in the printer,\n"
@@ -1518,6 +1830,8 @@ do_final_alignment(void)
 	       "What do you want to do (s, q, r)?\n"));
       fflush(stdout);
       inbuf = do_get_input(_("> "));
+      if (!inbuf)
+	continue;
       switch (inbuf[0])
 	{
 	case 'q':
@@ -1525,6 +1839,8 @@ do_final_alignment(void)
 	  printf(_("Please confirm by typing 'q' again that you wish to quit without saving:\n"));
 	  fflush(stdout);
 	  inbuf = do_get_input (_("> "));
+	  if (!inbuf)
+	    continue;
 	  if (inbuf[0] == 'q' || inbuf[0] == 'Q')
 	    {
 	      printf(_("OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -1538,6 +1854,8 @@ do_final_alignment(void)
 		   "alignment process:\n"));
 	  fflush(stdout);
 	  inbuf = do_get_input(_("> "));
+	  if (!inbuf)
+	    continue;
 	  if (inbuf[0] == 'r' || inbuf[0] == 'R')
 	    {
 	      printf(_("Repeating the alignment process.\n"));
@@ -1554,6 +1872,8 @@ do_final_alignment(void)
 
 	  fflush(stdout);
 	  inbuf = do_get_input(_("> "));
+	  if (!inbuf)
+	    continue;
 	  if (inbuf[0] == 's' || inbuf[0] == 'S')
 	    {
 	      printf(_("About to save settings..."));
@@ -1599,8 +1919,6 @@ do_align(void)
   int curpass;
   const stp_printer_t *printer = get_printer(0, 0);
   stp_parameter_t desc;
-  int passes = 0;
-  int choices = 0;
   const char *printer_name;
   stp_vars_t *v = stp_vars_create();
 
@@ -1610,28 +1928,35 @@ do_align(void)
   printer_name = stp_printer_get_long_name(printer);
   stp_set_driver(v, stp_printer_get_driver(printer));
 
-  stp_describe_parameter(v, "AlignmentPasses", &desc);
-  if (desc.p_type != STP_PARAMETER_TYPE_INT)
+  if (alignment_passes == 0)
     {
-      fprintf(stderr,
-	      "Unable to retrieve number of alignment passes for printer %s\n",
-	      printer_name);
-      return;
+      stp_describe_parameter(v, "AlignmentPasses", &desc);
+      if (desc.p_type != STP_PARAMETER_TYPE_INT)
+	{
+	  fprintf(stderr,
+		  "Unable to retrieve number of alignment passes for printer %s\n",
+		  printer_name);
+	  return;
+	}
+      alignment_passes = desc.deflt.integer;
+      stp_parameter_description_destroy(&desc);
     }
-  passes = desc.deflt.integer;
-  stp_parameter_description_destroy(&desc);
 
-  stp_describe_parameter(v, "AlignmentChoices", &desc);
-  if (desc.p_type != STP_PARAMETER_TYPE_INT)
+  if (alignment_choices == 0)
     {
-      fprintf(stderr,
-	      "Unable to retrieve number of alignment choices for printer %s\n",
-	      printer_name);
-      return;
+      stp_describe_parameter(v, "AlignmentChoices", &desc);
+      if (desc.p_type != STP_PARAMETER_TYPE_INT)
+	{
+	  fprintf(stderr,
+		  "Unable to retrieve number of alignment choices for printer %s\n",
+		  printer_name);
+	  return;
+	}
+      alignment_choices = desc.deflt.integer;
+      stp_parameter_description_destroy(&desc);
     }
-  choices = desc.deflt.integer;
-  stp_parameter_description_destroy(&desc);
-  if (passes <= 0 || choices <= 0)
+
+  if (alignment_passes <= 0 || alignment_choices <= 0)
     {
       printf("No alignment required for printer %s\n", printer_name);
       return;
@@ -1639,23 +1964,32 @@ do_align(void)
 
   do
     {
-      do_align_help(passes, choices);
+      do_align_help(alignment_passes, alignment_choices);
       printf(_(printer_msg), _(printer_name));
       inbuf = do_get_input(_("Press enter to continue > "));
     top:
       initialize_print_cmd(1);
-      for (curpass = 0; curpass < passes; curpass++)
+      for (curpass = 0; curpass < alignment_passes; curpass++)
 	do_remote_cmd("DT", 3, 0, curpass, 0);
       if (do_print_cmd())
 	printer_error();
       printf(_("Please inspect the print, and choose the best pair of lines in each pattern.\n"
 	       "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"));
       initialize_print_cmd(1);
-      for (curpass = 1; curpass <= passes; curpass ++)
+      for (curpass = 1; curpass <= alignment_passes; curpass ++)
 	{
+	  int retry_count = 0;
 	reread:
+	  retry_count++;
+	  if (retry_count > 10)
+	    {
+	      printf(_("Exiting\n"));
+	      return;
+	    }
 	  printf(_("Pass #%d"), curpass);
 	  inbuf = do_get_input(_("> "));
+	  if (!inbuf)
+	    goto reread;
 	  switch (inbuf[0])
 	    {
 	    case 'r':
@@ -1668,7 +2002,7 @@ do_align(void)
 	      goto top;
 	    case 'h':
 	    case '?':
-	      do_align_help(passes, choices);
+	      do_align_help(alignment_passes, alignment_choices);
 	      fflush(stdout);
 	    case '\n':
 	    case '\000':
@@ -1688,10 +2022,10 @@ do_align(void)
 	      fflush(stdout);
 	      goto reread;
 	    }
-	  if (answer < 1 || answer > choices)
+	  if (answer < 1 || answer > alignment_choices)
 	    {
 	      printf(_("The best pair of lines should be numbered between 1 and %d.\n"),
-		     choices);
+		     alignment_choices);
 	      fflush(stdout);
 	      goto reread;
 	    }
@@ -1704,11 +2038,11 @@ do_align(void)
       printf(_("Please verify that the alignment is correct.  After the alignment pattern\n"
 	       "is printed again, please ensure that the best pattern for each line is\n"
 	       "pattern %d.  If it is not, you should repeat the process to get the best\n"
-	       "quality printing.\n"), (choices + 1) / 2);
+	       "quality printing.\n"), (alignment_choices + 1) / 2);
       printf(_("Please insert a fresh sheet of paper.\n"));
       (void) do_get_input(_("Press enter to continue > "));
       initialize_print_cmd(1);
-      for (curpass = 0; curpass < passes; curpass++)
+      for (curpass = 0; curpass < alignment_passes; curpass++)
 	do_remote_cmd("DT", 3, 0, curpass, 0);
       if (do_print_cmd())
 	printer_error();
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index 316dcbe..c285af0 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.47 2005/11/22 14:43:05 rleigh Exp $
+## $Id: Makefile.am,v 1.49 2006/05/06 01:11:38 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@ if BUILD_FOOMATIC_3
 BUILD_FOOMATIC = 1
 endif
 
+STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
 
 ## Programs
 
@@ -74,6 +75,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(MAKE) install-kit FOOMATIC_DB=foomatic-db/gutenprint-ijs.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ; \
+	  $(MAKE) install-kit FOOMATIC_DB=foomatic-db/gutenprint-ijs-simplified.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ; \
 	fi
 
 install-kit:
@@ -91,7 +93,8 @@ foomatic-data: foomatic-stamp
 
 foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
 	-$(RM) -r foomatic-db
-	./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+	$(STP_ENV) ./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+	$(STP_ENV) ./foomatic-generator -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	touch foomatic-stamp
 
 dist-hook:
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 52bb281..8f800ae 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -280,6 +283,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -342,6 +346,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 DISTDIRS = foomatic-templates-ijs
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
 @BUILD_FOOMATIC_3_TRUE@BUILD_FOOMATIC = 1
+STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
 printer_options_SOURCES = printer_options.c
 printer_options_LDADD = $(GUTENPRINT_LIBS)
 printer_margins_SOURCES = printer_margins.c
@@ -618,9 +623,6 @@ uninstall-am: uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
@@ -640,6 +642,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(MAKE) install-kit FOOMATIC_DB=foomatic-db/gutenprint-ijs.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ; \
+	  $(MAKE) install-kit FOOMATIC_DB=foomatic-db/gutenprint-ijs-simplified.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ; \
 	fi
 
 install-kit:
@@ -657,7 +660,8 @@ foomatic-data: foomatic-stamp
 
 foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
 	-$(RM) -r foomatic-db
-	./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+	$(STP_ENV) ./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+	$(STP_ENV) ./foomatic-generator -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	touch foomatic-stamp
 
 dist-hook:
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index d3cf386..fdb2a37 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -6,17 +6,29 @@ Getopt::Long::Configure("no_ignore_case", "pass_through");
 GetOptions("m=s" => \$opt_m,         # Map file
            "t=s" => \$opt_t,         # Template directory
 	   "f=s" => \$opt_f,         # Foomatic version
-           "d=s" => \@opt_d);        # which Drivers?
+           "d=s" => \@opt_d,         # which Drivers?
+	   "s"   => \$opt_s);        # Generate simplified data
+
 
 # Wherever we put it...
 my $mapfile;
 # $mapfile = "../main/printers.xml";
 $mapfile = $opt_m;
 
+my $simplified = 0;
+my $simplified_subopt = "";
+my $simplified_suffix = "";
+if ($opt_s) {
+    $simplified = 1;
+    $simplified_subopt = "-s";
+    $simplified_suffix = "-simplified";
+}
+    
+
 my $templatedir;
 $templatedir = $opt_t;
 
-my @drivertypes = (ijs);
+my @drivertypes = ("ijs");
 
 exit 0 if ($#drivertypes < 0); # Nothing to be done, exit silently
 
@@ -84,8 +96,8 @@ my $opt_index = 0;
 
 use Data::Dumper;
 
-open PIPE, "./printer_options|" or die "Cannot run printer_options: $!\n";
-print STDERR "Loading options from ./printer_options...";
+open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n";
+print STDERR "Loading options from ./printer_options $simplified_subopt...";
 while(<PIPE>) {
     #print $_;
     next if m!^#!;
@@ -95,8 +107,8 @@ close PIPE or die "Cannot run printer_options: $!\n";
 print STDERR "done.\n";
 
 if ($foomatic3) {
-    open PIPE, "./printer_margins|" or die "Cannot run printer_margins: $!\n";
-    print STDERR "Loading margins from ./printer_margins...";
+    open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
+    print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
     $code = join('', <PIPE>);
     #print $code;
     close PIPE or die "Cannot run printer_margins: $!\n";
@@ -114,6 +126,53 @@ while(<PIPE>) {
 close PIPE or die "Cannot run printers: $!\n";
 print STDERR "done.\n";
 
+# Step 1: construct a map from Model= values to Foomatic model id's
+# this map is %mapstp.  The inverse from model to Model is %mapdb
+#
+# Foomatic is supposed to be a superset, so
+
+$missing_drivers = 0;
+
+%driverlist = ();
+%foolist = ();
+
+open PRINTERS, $mapfile or die "Cannot open mapfile $mapfile: $!\n";
+for (<PRINTERS>) {
+    if (m!^#\s*gptofoo\s+([^\s]+)\s+([^\s]+)!) {
+	if ($driverlist{$1}) {
+	    $missing_drivers = 1;
+	    warn "Duplicate driver $1\n";
+	}
+	$driverlist{$1} = 1;
+	if ($foolist{$2}) {
+	    $missing_drivers = 1;
+	    warn "Duplicate Foomatic ID $2\n";
+	}
+	$foolist{$2} = 1;
+	push (@{$mapstp{$1}}, $2);
+	$mapfoo{$2} = $1;	# do we need?
+    }
+}
+
+# Are we missing any stp printers?
+for (keys(%stpdata)) {
+    if (!defined($mapstp{$_})) {
+	$missing_drivers = 1;
+	warn "No foomatic printer IDs for gutenprint printer $_.\n";
+    }
+}
+
+for (keys(%mapstp)) {
+    if (!defined($stpdata{$_})) {
+	$missing_drivers = 1;
+	warn "No gutenprint printer for foomatic ID $_.\n";
+    }
+}
+
+if ($missing_drivers) {
+   die "Cannot continue\n";
+}
+
 # OK, now %stpdata is a big honking thing, and %defaults is in there, too.
 
 # Invert, to build %bar{$optionname} = [ choice1, choice2 ];
@@ -234,40 +293,6 @@ for $a (keys(%stp_dimension_values)) {
 #print join("\n", @intnumopts_list);
 #print join("\n", @dimensionnumopts_list);
 
-# Step 1: construct a map from Model= values to Foomatic model id's
-# this map is %mapstp.  The inverse from model to Model is %mapdb
-#
-# Foomatic is supposed to be a superset, so
-
-open PRINTERS, $mapfile or die "Cannot open mapfile $mapfile: $!\n";
-for (<PRINTERS>) {
-    if (m!^#\s*gptofoo\s+([^\s]+)\s+([^\s]+)!) {
-	push (@{$mapstp{$1}}, $2);
-	$mapfoo{$2} = $1;	# do we need?
-    }
-}
-
-$missing_drivers = 0;
-
-# Are we missing any stp printers?
-for (keys(%stpdata)) {
-    if (!defined($mapstp{$_})) {
-	$missing_drivers = 1;
-	warn "No foomatic printer IDs for gutenprint printer $_.\n";
-    }
-}
-
-for (keys(%mapstp)) {
-    if (!defined($stpdata{$_})) {
-	$missing_drivers = 1;
-	warn "No gutenprint printer for foomatic ID $_.\n";
-    }
-}
-
-if ($missing_drivers) {
-   die "Cannot continue\n";
-}
-
 # Figure out version etc
 open PIPE, "./gutenprint-version|" or die "Cannot run gutenprint-version: $!\n";
 my $stpvers = <PIPE>;
@@ -382,7 +407,7 @@ my $tmpl;
 for $drivertype (@drivertypes) {
     $drivertypesuffix = "-$drivertype";
     $drivertypesuffix =~ s/-gs//;
-    $drivertypesuffix .= ".$stprel";
+    $drivertypesuffix .= "$simplified_suffix.$stprel";
     my $drvname = "$drivernameprefix$drivertypesuffix";
     $generalsubs->{'DRVNAME'} = $drvname;
     print "Generating Foomatic data for driver \"$drvname\"...\n";
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index 4e3eeef..38758a3 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -1,112 +1,184 @@
-#gptofoo pcl-690 printer/Apollo-P-2100
-#gptofoo pcl-690 printer/Apollo-P-2150
-#gptofoo pcl-690 printer/Apollo-P-2200
-#gptofoo pcl-690 printer/Apollo-P-2250
-#gptofoo pcl-690 printer/Apollo-P-2500
-#gptofoo pcl-690 printer/Apollo-P-2550
-#gptofoo pcl-690 printer/Apollo-P-2600
-#gptofoo pcl-690 printer/Apollo-P-2650
+#gptofoo pcl-apollo-p2100 printer/Apollo-P-2100
+#gptofoo pcl-apollo-p2150 printer/Apollo-P-2150
+#gptofoo pcl-apollo-p2200 printer/Apollo-P-2200
+#gptofoo pcl-apollo-p2250 printer/Apollo-P-2250
+#gptofoo pcl-apollo-p2500 printer/Apollo-P-2500
+#gptofoo pcl-apollo-p2550 printer/Apollo-P-2550
+#gptofoo pcl-apollo-p2600 printer/Apollo-P-2600
+#gptofoo pcl-apollo-p2650 printer/Apollo-P-2650
 #gptofoo pcl-apple-4100 printer/Apple-Color_StyleWriter_4100
 #gptofoo pcl-apple-4500 printer/Apple-Color_StyleWriter_4500
 #gptofoo pcl-apple-6500 printer/Apple-Color_StyleWriter_6500
-#gptofoo pcl-2 printer/Apple-LaserWriter_Select_360
-#gptofoo pcl-2 printer/Brother-DCP-1200
-#gptofoo pcl-2 printer/Brother-HL-4Ve
-#gptofoo pcl-4 printer/Brother-HL-10h
-#gptofoo pcl-3 printer/Brother-HL-10V
-#gptofoo pcl-2 printer/Brother-HL-630
-#gptofoo pcl-4 printer/Brother-HL-660
-#gptofoo pcl-4 printer/Brother-HL-760
-#gptofoo pcl-4 printer/Brother-HL-960
-#gptofoo pcl-2 printer/Brother-HL-1040
-#gptofoo pcl-4 printer/Brother-HL-1050
-#gptofoo pcl-4 printer/Brother-HL-1060
-#gptofoo pcl-4 printer/Brother-HL-1070
-#gptofoo pcl-2 printer/Brother-HL-1240
-#gptofoo pcl-4 printer/Brother-HL-1250
-#gptofoo pcl-4 printer/Brother-HL-1260
-#gptofoo pcl-4 printer/Brother-HL-1270N
-#gptofoo pcl-4 printer/Brother-HL-1440
-#gptofoo pcl-4 printer/Brother-HL-1660e
-#gptofoo pcl-4 printer/Brother-HL-2060
-#gptofoo pcl-2 printer/Brother-MFC-6550MC
-#gptofoo pcl-3 printer/Brother-MFC-8300
-#gptofoo pcl-2 printer/Brother-MFC-9500
-#gptofoo pcl-2 printer/Brother-MFC-9600
+#gptofoo pcl-apple-lw360 printer/Apple-LaserWriter_Select_360
+#gptofoo brother-dcp-1200 printer/Brother-DCP-1200
+#gptofoo brother-hl-1040 printer/Brother-HL-1040
+#gptofoo brother-hl-1050 printer/Brother-HL-1050
+#gptofoo brother-hl-1060 printer/Brother-HL-1060
+#gptofoo brother-hl-1070 printer/Brother-HL-1070
+#gptofoo brother-hl-10v printer/Brother-HL-10V
+#gptofoo brother-hl-10h printer/Brother-HL-10h
+#gptofoo brother-hl-1240 printer/Brother-HL-1240
+#gptofoo brother-hl-1250 printer/Brother-HL-1250
+#gptofoo brother-hl-1260 printer/Brother-HL-1260
+#gptofoo brother-hl-1270n printer/Brother-HL-1270N
+#gptofoo brother-hl-1440 printer/Brother-HL-1440
+#gptofoo brother-hl-1660e printer/Brother-HL-1660e
+#gptofoo brother-hl-2060 printer/Brother-HL-2060
+#gptofoo brother-hl-4ve printer/Brother-HL-4Ve
+#gptofoo brother-hl-630 printer/Brother-HL-630
+#gptofoo brother-hl-660 printer/Brother-HL-660
+#gptofoo brother-hl-760 printer/Brother-HL-760
+#gptofoo brother-hl-960 printer/Brother-HL-960
+#gptofoo brother-mfc-6550mc printer/Brother-MFC-6550MC
+#gptofoo brother-mfc-8300 printer/Brother-MFC-8300
+#gptofoo brother-mfc-9500 printer/Brother-MFC-9500
+#gptofoo brother-mfc-9600 printer/Brother-MFC-9600
 #gptofoo bjc-30 printer/Canon-BJ-30
-#gptofoo bjc-50 printer/Canon-BJC-50
-#gptofoo bjc-55 printer/Canon-BJC-55
-#gptofoo bjc-80 printer/Canon-BJC-80
-#gptofoo bjc-85 printer/Canon-BJC-85
+#gptofoo bjc-1000 printer/Canon-BJC-1000
+#gptofoo bjc-2000 printer/Canon-BJC-2000
+#gptofoo bjc-2010 printer/Canon-BJC-2010
 #gptofoo bjc-210 printer/Canon-BJC-210
+#gptofoo bjc-2100 printer/Canon-BJC-2100
+#gptofoo bjc-2110 printer/Canon-BJC-2110
 #gptofoo bjc-240 printer/Canon-BJC-240
 #gptofoo bjc-250 printer/Canon-BJC-250
-#gptofoo bjc-1000 printer/Canon-BJC-1000
-#gptofoo bjc-2000 printer/Canon-BJC-2000
-#gptofoo bjc-2000 printer/Canon-BJC-2010
-#gptofoo bjc-4300 printer/Canon-BJC-2100
-#gptofoo bjc-2000 printer/Canon-BJC-2110
 #gptofoo bjc-3000 printer/Canon-BJC-3000
-#gptofoo bjc-4300 printer/Canon-BJC-4000
+#gptofoo bjc-4000 printer/Canon-BJC-4000
 #gptofoo bjc-4300 printer/Canon-BJC-4300
 #gptofoo bjc-4400 printer/Canon-BJC-4400
+#gptofoo bjc-50 printer/Canon-BJC-50
+#gptofoo bjc-55 printer/Canon-BJC-55
 #gptofoo bjc-6000 printer/Canon-BJC-6000
 #gptofoo bjc-6100 printer/Canon-BJC-6100
 #gptofoo bjc-6200 printer/Canon-BJC-6200
 #gptofoo bjc-6500 printer/Canon-BJC-6500
 #gptofoo bjc-7000 printer/Canon-BJC-7000
 #gptofoo bjc-7100 printer/Canon-BJC-7100
+#gptofoo bjc-80 printer/Canon-BJC-80
 #gptofoo bjc-8200 printer/Canon-BJC-8200
+#gptofoo bjc-85 printer/Canon-BJC-85
 #gptofoo canon-cp100 printer/Canon-CP-100
-#gptofoo canon-cp100 printer/Canon-CP-200
-#gptofoo canon-cp100 printer/Canon-CP-300
+#gptofoo canon-cp200 printer/Canon-CP-200
 #gptofoo canon-cp220 printer/Canon-CP-220
-#gptofoo canon-cp220 printer/Canon-CP-330
-#gptofoo canon-cp220 printer/Canon-SELPHY-CP-400
-#gptofoo canon-cp220 printer/Canon-SELPHY-CP-500
-#gptofoo canon-cp220 printer/Canon-SELPHY-CP-510
-#gptofoo canon-cp220 printer/Canon-SELPHY-CP-600
-#gptofoo canon-cp220 printer/Canon-SELPHY-CP-710
-#gptofoo pcl-4 printer/Canon-GP_335
-#gptofoo pcl-3 printer/Canon-LBP-4sx
-#gptofoo pcl-4l printer/Canon-LBP-430
-#gptofoo pcl-6 printer/Canon-LBP-1000
-#gptofoo pcl-6 printer/Canon-LBP-1260
-#gptofoo pcl-6 printer/Canon-LBP-1760
-#gptofoo bjc-4300 printer/Canon-S100
+#gptofoo canon-cp300 printer/Canon-CP-300
+#gptofoo canon-cp330 printer/Canon-CP-330
+#gptofoo canon-gp_335 printer/Canon-GP_335
+#gptofoo canon-lbp-1000 printer/Canon-LBP-1000
+#gptofoo canon-lbp-1260 printer/Canon-LBP-1260
+#gptofoo canon-lbp-1760 printer/Canon-LBP-1760
+#gptofoo canon-lbp-430 printer/Canon-LBP-430
+#gptofoo canon-lbp-4sx printer/Canon-LBP-4sx
+#gptofoo bjc-s100 printer/Canon-S100
 #gptofoo bjc-s200 printer/Canon-S200
-#gptofoo bjc-s800 printer/Canon-S300
+#gptofoo bjc-s300 printer/Canon-S300
 #gptofoo bjc-s400 printer/Canon-S400
 #gptofoo bjc-s450 printer/Canon-S450
-#gptofoo bjc-8200 printer/Canon-S500
-#gptofoo bjc-8200 printer/Canon-S600
-#gptofoo bjc-8200 printer/Canon-S630
-#gptofoo bjc-s800 printer/Canon-S800
 #gptofoo bjc-s4500 printer/Canon-S4500
+#gptofoo bjc-s500 printer/Canon-S500
+#gptofoo bjc-s600 printer/Canon-S600
+#gptofoo bjc-s630 printer/Canon-S630
+#gptofoo bjc-s800 printer/Canon-S800
+#gptofoo canon-cp400 printer/Canon-SELPHY-CP-400
+#gptofoo canon-cp500 printer/Canon-SELPHY-CP-500
+#gptofoo canon-cp510 printer/Canon-SELPHY-CP-510
+#gptofoo canon-cp600 printer/Canon-SELPHY-CP-600
+#gptofoo canon-cp710 printer/Canon-SELPHY-CP-710
 #gptofoo bjc-iP4000 printer/Canon-iP4000
-#gptofoo pcl-4 printer/Canon-imageRunner_330s
-#gptofoo pcl-2 printer/Citizen-ProJet_II
-#gptofoo pcl-3 printer/DEC-1800
-#gptofoo pcl-4 printer/DEC-LN17
-#gptofoo pcl-3 printer/Epson-ActionLaser_1100
-#gptofoo pcl-2 printer/Epson-ActionLaser_II
-#gptofoo pcl-4 printer/Epson-AcuLaser_C2000
-#gptofoo pcl-4 printer/Epson-AcuLaser_C2000PS
-#gptofoo pcl-4 printer/Epson-AcuLaser_C8500
-#gptofoo pcl-4 printer/Epson-AcuLaser_C8500PS
-#gptofoo pcl-4 printer/Epson-AcuLaser_C8600
-#gptofoo pcl-4 printer/Epson-AcuLaser_C8600PS
-#gptofoo pcl-3 printer/Epson-EPL-5200
-#gptofoo pcl-3 printer/Epson-EPL-5200plus
-#gptofoo pcl-4 printer/Epson-EPL-5700
-#gptofoo pcl-4 printer/Epson-EPL-5700PS
-#gptofoo pcl-4 printer/Epson-EPL-5800
-#gptofoo pcl-4 printer/Epson-EPL-5800PS
-#gptofoo pcl-4 printer/Epson-EPL-5900
-#gptofoo pcl-4 printer/Epson-EPL-5900PS
-#gptofoo pcl-4 printer/Epson-EPL-6100
-#gptofoo pcl-4 printer/Epson-EPL-6100PS
-#gptofoo pcl-2 printer/Epson-EPL-7100
+#gptofoo canon-ir_330s printer/Canon-imageRunner_330s
+#gptofoo citizen-projet_ii printer/Citizen-ProJet_II
+#gptofoo dec-1800 printer/DEC-1800
+#gptofoo dec-ln17 printer/DEC-LN17
+#gptofoo epson-actl_1100 printer/Epson-ActionLaser_1100
+#gptofoo epson-actl_ii printer/Epson-ActionLaser_II
+#gptofoo epson-acl_c2000 printer/Epson-AcuLaser_C2000
+#gptofoo epson-acl_c2000ps printer/Epson-AcuLaser_C2000PS
+#gptofoo epson-acl_c8500 printer/Epson-AcuLaser_C8500
+#gptofoo epson-acl_c8500ps printer/Epson-AcuLaser_C8500PS
+#gptofoo epson-acl_c8600 printer/Epson-AcuLaser_C8600
+#gptofoo epson-acl_c8600ps printer/Epson-AcuLaser_C8600PS
+#gptofoo escp2-cl700 printer/Epson-CL_700
+#gptofoo escp2-cl750 printer/Epson-CL_750
+#gptofoo escp2-cl760 printer/Epson-CL_760
+#gptofoo escp2-em900c printer/Epson-EM_900C
+#gptofoo escp2-em930c printer/Epson-EM_930C
+#gptofoo epson-epl-5200 printer/Epson-EPL-5200
+#gptofoo epson-epl-5200plus printer/Epson-EPL-5200plus
+#gptofoo epson-epl-5700 printer/Epson-EPL-5700
+#gptofoo epson-epl-5700ps printer/Epson-EPL-5700PS
+#gptofoo epson-epl-5800 printer/Epson-EPL-5800
+#gptofoo epson-epl-5800ps printer/Epson-EPL-5800PS
+#gptofoo epson-epl-5900 printer/Epson-EPL-5900
+#gptofoo epson-epl-5900ps printer/Epson-EPL-5900PS
+#gptofoo epson-epl-6100 printer/Epson-EPL-6100
+#gptofoo epson-epl-6100ps printer/Epson-EPL-6100PS
+#gptofoo epson-epl-7100 printer/Epson-EPL-7100
+#gptofoo escp2-e100 printer/Epson-E_100
+#gptofoo escp2-e150 printer/Epson-E_150
+#gptofoo escp2-e200 printer/Epson-E_200
+#gptofoo escp2-mc10000 printer/Epson-MC_10000
+#gptofoo escp2-mc2000 printer/Epson-MC_2000
+#gptofoo escp2-mc5000 printer/Epson-MC_5000
+#gptofoo escp2-mc7000 printer/Epson-MC_7000
+#gptofoo escp2-mc9000 printer/Epson-MC_9000
+#gptofoo escp2-mj5100c printer/Epson-MJ_5100C
+#gptofoo escp2-mj6000c printer/Epson-MJ_6000C
+#gptofoo escp2-mj8000c printer/Epson-MJ_8000C
+#gptofoo escp2-mj930c printer/Epson-MJ_930C
+#gptofoo escp2-pm10000 printer/Epson-PM_10000
+#gptofoo escp2-pm2000c printer/Epson-PM_2000C
+#gptofoo escp2-pm2200c printer/Epson-PM_2200C
+#gptofoo escp2-pm3000c printer/Epson-PM_3000C
+#gptofoo escp2-pm3300c printer/Epson-PM_3300C
+#gptofoo escp2-pm3500c printer/Epson-PM_3500C
+#gptofoo escp2-pm3700c printer/Epson-PM_3700C
+#gptofoo escp2-pm4000px printer/Epson-PM_4000PX
+#gptofoo escp2-pm5000c printer/Epson-PM_5000C
+#gptofoo escp2-pm7000c printer/Epson-PM_7000C
+#gptofoo escp2-pm700c printer/Epson-PM_700C
+#gptofoo escp2-pm730c printer/Epson-PM_730C
+#gptofoo escp2-pm740c printer/Epson-PM_740C
+#gptofoo escp2-pm750c printer/Epson-PM_750C
+#gptofoo escp2-pm760c printer/Epson-PM_760C
+#gptofoo escp2-pm770c printer/Epson-PM_770C
+#gptofoo escp2-pm780c printer/Epson-PM_780C
+#gptofoo escp2-pm790pt printer/Epson-PM_790PT
+#gptofoo escp2-pm800c printer/Epson-PM_800C
+#gptofoo escp2-pm850pt printer/Epson-PM_850PT
+#gptofoo escp2-pm870c printer/Epson-PM_870C
+#gptofoo escp2-pm880c printer/Epson-PM_880C
+#gptofoo escp2-pm9000c printer/Epson-PM_9000C
+#gptofoo escp2-pm930c printer/Epson-PM_930C
+#gptofoo escp2-pm940c printer/Epson-PM_940C
+#gptofoo escp2-pm950c printer/Epson-PM_950C
+#gptofoo escp2-pm970c printer/Epson-PM_970C
+#gptofoo escp2-pm980c printer/Epson-PM_980C
+#gptofoo escp2-pma650 printer/Epson-PM_A650
+#gptofoo escp2-pma750 printer/Epson-PM_A750
+#gptofoo escp2-pma890 printer/Epson-PM_A890
+#gptofoo escp2-pma900 printer/Epson-PM_A900
+#gptofoo escp2-pma950 printer/Epson-PM_A950
+#gptofoo escp2-pmd1000 printer/Epson-PM_D1000
+#gptofoo escp2-pmd600 printer/Epson-PM_D600
+#gptofoo escp2-pmd750 printer/Epson-PM_D750
+#gptofoo escp2-pmd770 printer/Epson-PM_D770
+#gptofoo escp2-pmd800 printer/Epson-PM_D800
+#gptofoo escp2-pmg700 printer/Epson-PM_G700
+#gptofoo escp2-pmg720 printer/Epson-PM_G720
+#gptofoo escp2-pmg730 printer/Epson-PM_G730
+#gptofoo escp2-pmg800 printer/Epson-PM_G800
+#gptofoo escp2-pmg820 printer/Epson-PM_G820
+#gptofoo escp2-px5500 printer/Epson-PX_5500
+#gptofoo escp2-px7000 printer/Epson-PX_7000
+#gptofoo escp2-px9000 printer/Epson-PX_9000
+#gptofoo escp2-pxa650 printer/Epson-PX_A650
+#gptofoo escp2-pxg5000 printer/Epson-PX_G5000
+#gptofoo escp2-pxg900 printer/Epson-PX_G900
+#gptofoo escp2-pxg920 printer/Epson-PX_G920
+#gptofoo escp2-pxv500 printer/Epson-PX_V500
+#gptofoo escp2-pxv600 printer/Epson-PX_V600
+#gptofoo escp2-pxv630 printer/Epson-PX_V630
+#gptofoo escp2-picmate printer/Epson-PictureMate
+#gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe
 #gptofoo escp2-c20 printer/Epson-Stylus_C20
 #gptofoo escp2-c20sx printer/Epson-Stylus_C20SX
 #gptofoo escp2-c20ux printer/Epson-Stylus_C20UX
@@ -145,12 +217,41 @@
 #gptofoo escp2-c85 printer/Epson-Stylus_C85
 #gptofoo escp2-c86 printer/Epson-Stylus_C86
 #gptofoo escp2-c88 printer/Epson-Stylus_C88
+#gptofoo escp2-cx1500 printer/Epson-Stylus_CX1500
+#gptofoo escp2-cx3100 printer/Epson-Stylus_CX3100
+#gptofoo escp2-cx3200 printer/Epson-Stylus_CX3200
+#gptofoo escp2-cx3500 printer/Epson-Stylus_CX3500
+#gptofoo escp2-cx3600 printer/Epson-Stylus_CX3600
+#gptofoo escp2-cx3650 printer/Epson-Stylus_CX3650
+#gptofoo escp2-cx3700 printer/Epson-Stylus_CX3700
+#gptofoo escp2-cx3800 printer/Epson-Stylus_CX3800
+#gptofoo escp2-cx3805 printer/Epson-Stylus_CX3805
+#gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810
+#gptofoo escp2-cx4100 printer/Epson-Stylus_CX4100
+#gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200
+#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-cx5100 printer/Epson-Stylus_CX5100
+#gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
+#gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
+#gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
+#gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
+#gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
+#gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300
+#gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400
+#gptofoo escp2-cx6500 printer/Epson-Stylus_CX6500
+#gptofoo escp2-cx6600 printer/Epson-Stylus_CX6600
+#gptofoo escp2-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 printer/Epson-Stylus_Color
-#gptofoo escp2 printer/Epson-Stylus_Color_I
-#gptofoo escp2 printer/Epson-Stylus_Color_II
-#gptofoo escp2 printer/Epson-Stylus_Color_IIs
-#gptofoo escp2-pro printer/Epson-Stylus_Color_PRO
-#gptofoo escp2-pro-xl printer/Epson-Stylus_Pro_XL
+#gptofoo escp2-1160 printer/Epson-Stylus_Color_1160
+#gptofoo escp2-1500 printer/Epson-Stylus_Color_1500
+#gptofoo escp2-1520 printer/Epson-Stylus_Color_1520
+#gptofoo escp2-3000 printer/Epson-Stylus_Color_3000
 #gptofoo escp2-400 printer/Epson-Stylus_Color_400
 #gptofoo escp2-440 printer/Epson-Stylus_Color_440
 #gptofoo escp2-460 printer/Epson-Stylus_Color_460
@@ -165,18 +266,32 @@
 #gptofoo escp2-740 printer/Epson-Stylus_Color_740
 #gptofoo escp2-760 printer/Epson-Stylus_Color_760
 #gptofoo escp2-777 printer/Epson-Stylus_Color_777
-#gptofoo escp2-83 printer/Epson-Stylus_Color_8_3
 #gptofoo escp2-800 printer/Epson-Stylus_Color_800
 #gptofoo escp2-850 printer/Epson-Stylus_Color_850
 #gptofoo escp2-860 printer/Epson-Stylus_Color_860
 #gptofoo escp2-880 printer/Epson-Stylus_Color_880
+#gptofoo escp2-83 printer/Epson-Stylus_Color_8_3
 #gptofoo escp2-900 printer/Epson-Stylus_Color_900
 #gptofoo escp2-980 printer/Epson-Stylus_Color_980
-#gptofoo escp2-1160 printer/Epson-Stylus_Color_1160
-#gptofoo escp2-1500 printer/Epson-Stylus_Color_1500
-#gptofoo escp2-1520 printer/Epson-Stylus_Color_1520
-#gptofoo escp2-3000 printer/Epson-Stylus_Color_3000
+#gptofoo escp2-i printer/Epson-Stylus_Color_I
+#gptofoo escp2-ii printer/Epson-Stylus_Color_II
+#gptofoo escp2-iis printer/Epson-Stylus_Color_IIs
+#gptofoo escp2-pro printer/Epson-Stylus_Color_PRO
+#gptofoo escp2-d68 printer/Epson-Stylus_D68
+#gptofoo escp2-d88 printer/Epson-Stylus_D88
+#gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
+#gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
+#gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
+#gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250
+#gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
 #gptofoo escp2-photo printer/Epson-Stylus_Photo
+#gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200
+#gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
+#gptofoo escp2-1280 printer/Epson-Stylus_Photo_1280
+#gptofoo escp2-1290 printer/Epson-Stylus_Photo_1290
+#gptofoo escp2-2000 printer/Epson-Stylus_Photo_2000P
+#gptofoo escp2-2100 printer/Epson-Stylus_Photo_2100
+#gptofoo escp2-2200 printer/Epson-Stylus_Photo_2200
 #gptofoo escp2-700 printer/Epson-Stylus_Photo_700
 #gptofoo escp2-720 printer/Epson-Stylus_Photo_720
 #gptofoo escp2-750 printer/Epson-Stylus_Photo_750
@@ -187,6 +302,7 @@
 #gptofoo escp2-820 printer/Epson-Stylus_Photo_820
 #gptofoo escp2-825 printer/Epson-Stylus_Photo_825
 #gptofoo escp2-830 printer/Epson-Stylus_Photo_830
+#gptofoo escp2-830u printer/Epson-Stylus_Photo_830U
 #gptofoo escp2-870 printer/Epson-Stylus_Photo_870
 #gptofoo escp2-875 printer/Epson-Stylus_Photo_875
 #gptofoo escp2-890 printer/Epson-Stylus_Photo_890
@@ -197,22 +313,18 @@
 #gptofoo escp2-935 printer/Epson-Stylus_Photo_935
 #gptofoo escp2-950 printer/Epson-Stylus_Photo_950
 #gptofoo escp2-960 printer/Epson-Stylus_Photo_960
-#gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200
-#gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
-#gptofoo escp2-1280 printer/Epson-Stylus_Photo_1280
-#gptofoo escp2-1290 printer/Epson-Stylus_Photo_1290
-#gptofoo escp2-2000 printer/Epson-Stylus_Photo_2000P
-#gptofoo escp2-2100 printer/Epson-Stylus_Photo_2100
-#gptofoo escp2-2200 printer/Epson-Stylus_Photo_2200
 #gptofoo escp2-ex printer/Epson-Stylus_Photo_EX
 #gptofoo escp2-ex3 printer/Epson-Stylus_Photo_EX3
+#gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
 #gptofoo escp2-r220 printer/Epson-Stylus_Photo_R220
+#gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300
 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310
 #gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320
 #gptofoo escp2-r340 printer/Epson-Stylus_Photo_R340
+#gptofoo escp2-r800 printer/Epson-Stylus_Photo_R800
 #gptofoo escp2-rx400 printer/Epson-Stylus_Photo_RX400
 #gptofoo escp2-rx420 printer/Epson-Stylus_Photo_RX420
 #gptofoo escp2-rx425 printer/Epson-Stylus_Photo_RX425
@@ -223,9 +335,7 @@
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
 #gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700
-#gptofoo escp2-r800 printer/Epson-Stylus_Photo_R800
-#gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
-#gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
+#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000
 #gptofoo escp2-5500 printer/Epson-Stylus_Pro_5500
 #gptofoo escp2-7000 printer/Epson-Stylus_Pro_7000
@@ -234,500 +344,402 @@
 #gptofoo escp2-9000 printer/Epson-Stylus_Pro_9000
 #gptofoo escp2-9500 printer/Epson-Stylus_Pro_9500
 #gptofoo escp2-9600 printer/Epson-Stylus_Pro_9600
-#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
+#gptofoo escp2-pro-xl printer/Epson-Stylus_Pro_XL
 #gptofoo escp2-scan2000 printer/Epson-Stylus_Scan_2000
 #gptofoo escp2-scan2500 printer/Epson-Stylus_Scan_2500
-#gptofoo escp2-cx1500 printer/Epson-Stylus_CX1500
-#gptofoo escp2-cx3100 printer/Epson-Stylus_CX3100
-#gptofoo escp2-cx3200 printer/Epson-Stylus_CX3200
-#gptofoo escp2-cx3500 printer/Epson-Stylus_CX3500
-#gptofoo escp2-cx3600 printer/Epson-Stylus_CX3600
-#gptofoo escp2-cx3650 printer/Epson-Stylus_CX3650
-#gptofoo escp2-cx3700 printer/Epson-Stylus_CX3700
-#gptofoo escp2-cx3800 printer/Epson-Stylus_CX3800
-#gptofoo escp2-cx3805 printer/Epson-Stylus_CX3805
-#gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810
-#gptofoo escp2-cx4100 printer/Epson-Stylus_CX4100
-#gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200
-#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-cx5100 printer/Epson-Stylus_CX5100
-#gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
-#gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
-#gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
-#gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
-#gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
-#gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300
-#gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400
-#gptofoo escp2-cx6500 printer/Epson-Stylus_CX6500
-#gptofoo escp2-cx6600 printer/Epson-Stylus_CX6600
-#gptofoo escp2-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-d68 printer/Epson-Stylus_D68
-#gptofoo escp2-d88 printer/Epson-Stylus_D88
-#gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
-#gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
-#gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
-#gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250
-#gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
-#gptofoo escp2-picmate printer/Epson-PictureMate
-#gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe
-#gptofoo escp2-cl700 printer/Epson-CL_700
-#gptofoo escp2-cl750 printer/Epson-CL_750
-#gptofoo escp2-cl760 printer/Epson-CL_760
-#gptofoo escp2-e100 printer/Epson-E_100
-#gptofoo escp2-em900c printer/Epson-EM_900C
-#gptofoo escp2-em930c printer/Epson-EM_930C
-#gptofoo escp2-mc2000 printer/Epson-MC_2000
-#gptofoo escp2-mc5000 printer/Epson-MC_5000
-#gptofoo escp2-mc7000 printer/Epson-MC_7000
-#gptofoo escp2-mc9000 printer/Epson-MC_9000
-#gptofoo escp2-mc10000 printer/Epson-MC_10000
-#gptofoo escp2-mj930c printer/Epson-MJ_930C
-#gptofoo escp2-mj5100c printer/Epson-MJ_5100C
-#gptofoo escp2-mj6000c printer/Epson-MJ_6000C
-#gptofoo escp2-mj8000c printer/Epson-MJ_8000C
-#gptofoo escp2-pm700c printer/Epson-PM_700C
-#gptofoo escp2-pm730c printer/Epson-PM_730C
-#gptofoo escp2-pm740c printer/Epson-PM_740C
-#gptofoo escp2-pm750c printer/Epson-PM_750C
-#gptofoo escp2-pm760c printer/Epson-PM_760C
-#gptofoo escp2-pm770c printer/Epson-PM_770C
-#gptofoo escp2-pm780c printer/Epson-PM_780C
-#gptofoo escp2-pm790pt printer/Epson-PM_790PT
-#gptofoo escp2-pm800c printer/Epson-PM_800C
-#gptofoo escp2-pm850pt printer/Epson-PM_850PT
-#gptofoo escp2-pm870c printer/Epson-PM_870C
-#gptofoo escp2-pm880c printer/Epson-PM_880C
-#gptofoo escp2-pm930c printer/Epson-PM_930C
-#gptofoo escp2-pm940c printer/Epson-PM_940C
-#gptofoo escp2-pm950c printer/Epson-PM_950C
-#gptofoo escp2-pm970c printer/Epson-PM_970C
-#gptofoo escp2-pm980c printer/Epson-PM_980C
-#gptofoo escp2-pm2000c printer/Epson-PM_2000C
-#gptofoo escp2-pm2200c printer/Epson-PM_2200C
-#gptofoo escp2-pm3000c printer/Epson-PM_3000C
-#gptofoo escp2-pm3300c printer/Epson-PM_3300C
-#gptofoo escp2-pm3500c printer/Epson-PM_3500C
-#gptofoo escp2-pm3700c printer/Epson-PM_3700C
-#gptofoo escp2-pm4000px printer/Epson-PM_4000PX
-#gptofoo escp2-pm5000c printer/Epson-PM_5000C
-#gptofoo escp2-pm7000c printer/Epson-PM_7000C
-#gptofoo escp2-pm9000c printer/Epson-PM_9000C
-#gptofoo escp2-pm10000 printer/Epson-PM_10000
-#gptofoo escp2-pma900 printer/Epson-PM_A900
-#gptofoo escp2-pmd750 printer/Epson-PM_D750
-#gptofoo escp2-pmd770 printer/Epson-PM_D770
-#gptofoo escp2-pmd1000 printer/Epson-PM_D1000
-#gptofoo escp2-pmg700 printer/Epson-PM_G700
-#gptofoo escp2-pmg720 printer/Epson-PM_G720
-#gptofoo escp2-pmg800 printer/Epson-PM_G800
-#gptofoo escp2-pmg820 printer/Epson-PM_G820
-#gptofoo escp2-pxa650 printer/Epson-PX_A650
-#gptofoo escp2-pxg900 printer/Epson-PX_G900
-#gptofoo escp2-pxg920 printer/Epson-PX_G920
-#gptofoo escp2-pxg5000 printer/Epson-PX_G5000
-#gptofoo escp2-pxv500 printer/Epson-PX_V500
-#gptofoo escp2-pxv600 printer/Epson-PX_V600
-#gptofoo escp2-px5500 printer/Epson-PX_5500
-#gptofoo escp2-px7000 printer/Epson-PX_7000
-#gptofoo escp2-px9000 printer/Epson-PX_9000
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
-#gptofoo pcl-4 printer/Fujitsu-PrintPartner_10V
-#gptofoo pcl-4 printer/Fujitsu-PrintPartner_16DV
-#gptofoo pcl-6 printer/Fujitsu-PrintPartner_20W
-#gptofoo pcl-3 printer/Fujitsu-PrintPartner_8000
+#gptofoo fujitsu-pp_10v printer/Fujitsu-PrintPartner_10V
+#gptofoo fujitsu-pp_16dv printer/Fujitsu-PrintPartner_16DV
+#gptofoo fujitsu-pp_20w printer/Fujitsu-PrintPartner_20W
+#gptofoo fujitsu-pp_8000 printer/Fujitsu-PrintPartner_8000
+#gptofoo pcl-g_4 printer/Generic-PCL_4_Printer
+#gptofoo pcl-g_5 printer/Generic-PCL_5_Printer
+#gptofoo pcl-g_5c printer/Generic-PCL_5c_Printer
+#gptofoo pcl-g_5e printer/Generic-PCL_5e_Printer
+#gptofoo pcl-g_6 printer/Generic-PCL_6_PCL_XL_Printer
 #gptofoo pcl-2000 printer/HP-2000C
 #gptofoo pcl-2500 printer/HP-2500C
-#gptofoo pcl-2500 printer/HP-2500CM
-#gptofoo pcl-900 printer/HP-Business_Inkjet_2200
-#gptofoo pcl-900 printer/HP-Business_Inkjet_2230
-#gptofoo pcl-900 printer/HP-Business_Inkjet_2250
-#gptofoo pcl-900 printer/HP-Business_Inkjet_2250TN
-#gptofoo pcl-900 printer/HP-Business_Inkjet_2280
-#gptofoo pcl-900 printer/HP-Color_Inkjet_Printer_CP1160
-#gptofoo pcl-1220 printer/HP-Color_Inkjet_Printer_CP1700
-#gptofoo pcl-3 printer/HP-Color_LaserJet_5
-#gptofoo pcl-4 printer/HP-Color_LaserJet_2500
-#gptofoo pcl-4 printer/HP-Color_LaserJet_4500
-#gptofoo pcl-4 printer/HP-Color_LaserJet_4550
-#gptofoo pcl-4 printer/HP-Color_LaserJet_4600
-#gptofoo pcl-4 printer/HP-Color_LaserJet_5000
-#gptofoo pcl-4 printer/HP-Color_LaserJet_5500
-#gptofoo pcl-4 printer/HP-Color_LaserJet_8550GN
+#gptofoo hp-2500cm printer/HP-2500CM
+#gptofoo hp-bij_2200 printer/HP-Business_Inkjet_2200
+#gptofoo hp-bij_2230 printer/HP-Business_Inkjet_2230
+#gptofoo hp-bij_2250 printer/HP-Business_Inkjet_2250
+#gptofoo hp-bij_2250tn printer/HP-Business_Inkjet_2250TN
+#gptofoo hp-bij_2280 printer/HP-Business_Inkjet_2280
+#gptofoo hp-cij_cp1160 printer/HP-Color_Inkjet_Printer_CP1160
+#gptofoo hp-cij_cp1700 printer/HP-Color_Inkjet_Printer_CP1700
+#gptofoo hp-clj_2500 printer/HP-Color_LaserJet_2500
+#gptofoo hp-clj_4500 printer/HP-Color_LaserJet_4500
+#gptofoo hp-clj_4550 printer/HP-Color_LaserJet_4550
+#gptofoo hp-clj_4600 printer/HP-Color_LaserJet_4600
+#gptofoo hp-clj_5 printer/HP-Color_LaserJet_5
+#gptofoo hp-clj_5000 printer/HP-Color_LaserJet_5000
+#gptofoo hp-clj_5500 printer/HP-Color_LaserJet_5500
+#gptofoo hp-clj_8550gn printer/HP-Color_LaserJet_8550GN
 #gptofoo pcl-desnj-230 printer/HP-DesignJet_230
+#gptofoo pcl-desnj-2500 printer/HP-DesignJet_2500CP
 #gptofoo pcl-desnj-250 printer/HP-DesignJet_250C
+#gptofoo pcl-desnj-3500 printer/HP-DesignJet_3500CP
 #gptofoo pcl-desnj-430 printer/HP-DesignJet_430
 #gptofoo pcl-desnj-450 printer/HP-DesignJet_450C
 #gptofoo pcl-desnj-455 printer/HP-DesignJet_455CA
 #gptofoo pcl-desnj-488 printer/HP-DesignJet_488CA
 #gptofoo pcl-desnj-700 printer/HP-DesignJet_700
 #gptofoo pcl-750 printer/HP-DesignJet_750
-#gptofoo pcl-750 printer/HP-DesignJet_750C_Plus
-#gptofoo pcl-desnj-2500 printer/HP-DesignJet_2500CP
-#gptofoo pcl-desnj-3500 printer/HP-DesignJet_3500CP
-#gptofoo pcl-2500 printer/HP-DesignJet_ColorPro_CAD
+#gptofoo hp-desnj_750c_plus printer/HP-DesignJet_750C_Plus
+#gptofoo hp-desnj_cp_cad printer/HP-DesignJet_ColorPro_CAD
+#gptofoo pcl-1100 printer/HP-DeskJet_1100C
+#gptofoo pcl-1120 printer/HP-DeskJet_1120C
+#gptofoo hp-dj_1125c printer/HP-DeskJet_1125C
+#gptofoo pcl-1200 printer/HP-DeskJet_1200C
+#gptofoo pcl-1220 printer/HP-DeskJet_1220C
+#gptofoo pcl-1600 printer/HP-DeskJet_1600C
+#gptofoo hp-dj_1600cm printer/HP-DeskJet_1600CM
 #gptofoo pcl-340 printer/HP-DeskJet_340C
+#gptofoo hp-dj_3810 printer/HP-DeskJet_3810
+#gptofoo hp-dj_3816 printer/HP-DeskJet_3816
+#gptofoo hp-dj_3820 printer/HP-DeskJet_3820
+#gptofoo hp-dj_3822 printer/HP-DeskJet_3822
 #gptofoo pcl-400 printer/HP-DeskJet_400
-#gptofoo pcl-540 printer/HP-DeskJet_400C
-#gptofoo pcl-540 printer/HP-DeskJet_420C
-#gptofoo pcl-900 printer/HP-DeskJet_450
+#gptofoo hp-dj_420c printer/HP-DeskJet_420C
+#gptofoo hp-dj_450 printer/HP-DeskJet_450
 #gptofoo pcl-500 printer/HP-DeskJet_500
 #gptofoo pcl-501 printer/HP-DeskJet_500C
-#gptofoo pcl-500 printer/HP-DeskJet_505J_Plus
-#gptofoo pcl-500 printer/HP-DeskJet_510
+#gptofoo hp-dj_505j_plus printer/HP-DeskJet_505J_Plus
+#gptofoo hp-dj_510 printer/HP-DeskJet_510
 #gptofoo pcl-520 printer/HP-DeskJet_520
 #gptofoo pcl-540 printer/HP-DeskJet_540C
 #gptofoo pcl-550 printer/HP-DeskJet_550C
+#gptofoo hp-dj_5550 printer/HP-DeskJet_5550
+#gptofoo hp-dj_5551 printer/HP-DeskJet_5551
 #gptofoo pcl-560 printer/HP-DeskJet_560C
 #gptofoo pcl-600 printer/HP-DeskJet_600
-#gptofoo pcl-690 printer/HP-DeskJet_610C
-#gptofoo pcl-690 printer/HP-DeskJet_610CL
-#gptofoo pcl-690 printer/HP-DeskJet_612C
-#gptofoo pcl-690 printer/HP-DeskJet_640C
-#gptofoo pcl-690 printer/HP-DeskJet_648C
-#gptofoo pcl-601 printer/HP-DeskJet_660C
-#gptofoo pcl-601 printer/HP-DeskJet_670C
-#gptofoo pcl-601 printer/HP-DeskJet_670TV
-#gptofoo pcl-601 printer/HP-DeskJet_672C
-#gptofoo pcl-601 printer/HP-DeskJet_680C
-#gptofoo pcl-601 printer/HP-DeskJet_682C
+#gptofoo pcl-601 printer/HP-DeskJet_600C
+#gptofoo hp-dj_610c printer/HP-DeskJet_610C
+#gptofoo hp-dj_610cl printer/HP-DeskJet_610CL
+#gptofoo hp-dj_6122 printer/HP-DeskJet_6122
+#gptofoo hp-dj_6127 printer/HP-DeskJet_6127
+#gptofoo hp-dj_612c printer/HP-DeskJet_612C
+#gptofoo hp-dj_640c printer/HP-DeskJet_640C
+#gptofoo hp-dj_648c printer/HP-DeskJet_648C
+#gptofoo hp-dj_660c printer/HP-DeskJet_660C
+#gptofoo hp-dj_670c printer/HP-DeskJet_670C
+#gptofoo hp-dj_670tv printer/HP-DeskJet_670TV
+#gptofoo hp-dj_672c printer/HP-DeskJet_672C
+#gptofoo hp-dj_680c printer/HP-DeskJet_680C
+#gptofoo hp-dj_682c printer/HP-DeskJet_682C
 #gptofoo pcl-690 printer/HP-DeskJet_690C
-#gptofoo pcl-690 printer/HP-DeskJet_692C
-#gptofoo pcl-690 printer/HP-DeskJet_693C
-#gptofoo pcl-690 printer/HP-DeskJet_694C
-#gptofoo pcl-690 printer/HP-DeskJet_695C
-#gptofoo pcl-690 printer/HP-DeskJet_697C
+#gptofoo hp-dj_692c printer/HP-DeskJet_692C
+#gptofoo hp-dj_693c printer/HP-DeskJet_693C
+#gptofoo hp-dj_694c printer/HP-DeskJet_694C
+#gptofoo hp-dj_695c printer/HP-DeskJet_695C
+#gptofoo hp-dj_697c printer/HP-DeskJet_697C
 #gptofoo pcl-810 printer/HP-DeskJet_810C
 #gptofoo pcl-812 printer/HP-DeskJet_812C
-#gptofoo pcl-812 printer/HP-DeskJet_815C
-#gptofoo pcl-810 printer/HP-DeskJet_816C
-#gptofoo pcl-845 printer/HP-DeskJet_825C
-#gptofoo pcl-810 printer/HP-DeskJet_830C
-#gptofoo pcl-810 printer/HP-DeskJet_832C
+#gptofoo hp-dj_815c printer/HP-DeskJet_815C
+#gptofoo hp-dj_816c printer/HP-DeskJet_816C
+#gptofoo hp-dj_825c printer/HP-DeskJet_825C
+#gptofoo hp-dj_830c printer/HP-DeskJet_830C
+#gptofoo hp-dj_832c printer/HP-DeskJet_832C
 #gptofoo pcl-840 printer/HP-DeskJet_840C
-#gptofoo pcl-840 printer/HP-DeskJet_841C
+#gptofoo hp-dj_841c printer/HP-DeskJet_841C
 #gptofoo pcl-842 printer/HP-DeskJet_842C
-#gptofoo pcl-842 printer/HP-DeskJet_843C
+#gptofoo hp-dj_843c printer/HP-DeskJet_843C
 #gptofoo pcl-845 printer/HP-DeskJet_845C
 #gptofoo pcl-850 printer/HP-DeskJet_850C
 #gptofoo pcl-855 printer/HP-DeskJet_855C
 #gptofoo pcl-870 printer/HP-DeskJet_870C
-#gptofoo pcl-810 printer/HP-DeskJet_880C
-#gptofoo pcl-810 printer/HP-DeskJet_882C
+#gptofoo hp-dj_880c printer/HP-DeskJet_880C
+#gptofoo hp-dj_882c printer/HP-DeskJet_882C
 #gptofoo pcl-890 printer/HP-DeskJet_890C
 #gptofoo pcl-895 printer/HP-DeskJet_895C
 #gptofoo pcl-900 printer/HP-DeskJet_916C
-#gptofoo pcl-900 printer/HP-DeskJet_920C
-#gptofoo pcl-900 printer/HP-DeskJet_930C
-#gptofoo pcl-900 printer/HP-DeskJet_932C
-#gptofoo pcl-900 printer/HP-DeskJet_933C
-#gptofoo pcl-900 printer/HP-DeskJet_934C
-#gptofoo pcl-900 printer/HP-DeskJet_935C
-#gptofoo pcl-900 printer/HP-DeskJet_940C
-#gptofoo pcl-900 printer/HP-DeskJet_948C
-#gptofoo pcl-900 printer/HP-DeskJet_950C
-#gptofoo pcl-900 printer/HP-DeskJet_952C
-#gptofoo pcl-900 printer/HP-DeskJet_955C
-#gptofoo pcl-900 printer/HP-DeskJet_957C
-#gptofoo pcl-900 printer/HP-DeskJet_959C
-#gptofoo pcl-900 printer/HP-DeskJet_960C
-#gptofoo pcl-900 printer/HP-DeskJet_970C
-#gptofoo pcl-900 printer/HP-DeskJet_975C
-#gptofoo pcl-900 printer/HP-DeskJet_980C
-#gptofoo pcl-900 printer/HP-DeskJet_990C
-#gptofoo pcl-900 printer/HP-DeskJet_995C
-#gptofoo pcl-1100 printer/HP-DeskJet_1100C
-#gptofoo pcl-1120 printer/HP-DeskJet_1120C
-#gptofoo pcl-1120 printer/HP-DeskJet_1125C
-#gptofoo pcl-1200 printer/HP-DeskJet_1200C
-#gptofoo pcl-1220 printer/HP-DeskJet_1220C
-#gptofoo pcl-1600 printer/HP-DeskJet_1600C
-#gptofoo pcl-1600 printer/HP-DeskJet_1600CM
-#gptofoo pcl-900 printer/HP-DeskJet_3810
-#gptofoo pcl-900 printer/HP-DeskJet_3816
-#gptofoo pcl-900 printer/HP-DeskJet_3820
-#gptofoo pcl-900 printer/HP-DeskJet_3822
-#gptofoo pcl-900 printer/HP-DeskJet_5550
-#gptofoo pcl-900 printer/HP-DeskJet_5551
-#gptofoo pcl-900 printer/HP-DeskJet_6122
-#gptofoo pcl-900 printer/HP-DeskJet_6127
-#gptofoo pcl-900 printer/HP-DeskJet_9300
-#gptofoo pcl-601 printer/HP-e-printer_e20
+#gptofoo hp-dj_920c printer/HP-DeskJet_920C
+#gptofoo hp-dj_9300 printer/HP-DeskJet_9300
+#gptofoo hp-dj_930c printer/HP-DeskJet_930C
+#gptofoo hp-dj_932c printer/HP-DeskJet_932C
+#gptofoo hp-dj_933c printer/HP-DeskJet_933C
+#gptofoo hp-dj_934c printer/HP-DeskJet_934C
+#gptofoo hp-dj_935c printer/HP-DeskJet_935C
+#gptofoo hp-dj_940c printer/HP-DeskJet_940C
+#gptofoo hp-dj_948c printer/HP-DeskJet_948C
+#gptofoo hp-dj_950c printer/HP-DeskJet_950C
+#gptofoo hp-dj_952c printer/HP-DeskJet_952C
+#gptofoo hp-dj_955c printer/HP-DeskJet_955C
+#gptofoo hp-dj_957c printer/HP-DeskJet_957C
+#gptofoo hp-dj_959c printer/HP-DeskJet_959C
+#gptofoo hp-dj_960c printer/HP-DeskJet_960C
+#gptofoo hp-dj_970c printer/HP-DeskJet_970C
+#gptofoo hp-dj_975c printer/HP-DeskJet_975C
+#gptofoo hp-dj_980c printer/HP-DeskJet_980C
+#gptofoo hp-dj_990c printer/HP-DeskJet_990C
+#gptofoo hp-dj_995c printer/HP-DeskJet_995C
+#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_1100 printer/HP-LaserJet_1100
+#gptofoo hp-lj_1100a printer/HP-LaserJet_1100A
+#gptofoo hp-lj_1150 printer/HP-LaserJet_1150
+#gptofoo hp-lj_1200 printer/HP-LaserJet_1200
+#gptofoo hp-lj_1220 printer/HP-LaserJet_1220
+#gptofoo hp-lj_1300 printer/HP-LaserJet_1300
 #gptofoo pcl-2 printer/HP-LaserJet_2
-#gptofoo pcl-2 printer/HP-LaserJet_2D
+#gptofoo hp-lj_2100 printer/HP-LaserJet_2100
+#gptofoo hp-lj_2100m printer/HP-LaserJet_2100M
+#gptofoo hp-lj_2200 printer/HP-LaserJet_2200
+#gptofoo hp-lj_2300 printer/HP-LaserJet_2300
+#gptofoo hp-lj_2d printer/HP-LaserJet_2D
 #gptofoo pcl-2p printer/HP-LaserJet_2P
-#gptofoo pcl-2p printer/HP-LaserJet_2P_Plus
+#gptofoo hp-lj_2p_plus printer/HP-LaserJet_2P_Plus
 #gptofoo pcl-3 printer/HP-LaserJet_3
-#gptofoo pcl-3 printer/HP-LaserJet_3D
-#gptofoo pcl-4l printer/HP-LaserJet_3P_w_PCL5
-#gptofoo pcl-3 printer/HP-LaserJet_3P_w_PS
+#gptofoo hp-lj_3200 printer/HP-LaserJet_3200
+#gptofoo hp-lj_3200m printer/HP-LaserJet_3200m
+#gptofoo hp-lj_3200se printer/HP-LaserJet_3200se
+#gptofoo hp-lj_3300_mfp printer/HP-LaserJet_3300_MFP
+#gptofoo hp-lj_3310_mfp printer/HP-LaserJet_3310_MFP
+#gptofoo hp-lj_3320n_mfp printer/HP-LaserJet_3320N_MFP
+#gptofoo hp-lj_3320_mfp printer/HP-LaserJet_3320_MFP
+#gptofoo hp-lj_3330_mfp printer/HP-LaserJet_3330_MFP
+#gptofoo hp-lj_3d printer/HP-LaserJet_3D
+#gptofoo hp-lj_3p_w_pcl5 printer/HP-LaserJet_3P_w_PCL5
+#gptofoo hp-lj_3p_w_ps printer/HP-LaserJet_3P_w_PS
 #gptofoo pcl-4 printer/HP-LaserJet_4
-#gptofoo pcl-4 printer/HP-LaserJet_4_Plus
+#gptofoo hp-lj_4000 printer/HP-LaserJet_4000
+#gptofoo hp-lj_4050 printer/HP-LaserJet_4050
+#gptofoo hp-lj_4100 printer/HP-LaserJet_4100
+#gptofoo hp-lj_4200 printer/HP-LaserJet_4200
+#gptofoo hp-lj_4300 printer/HP-LaserJet_4300
 #gptofoo pcl-4l printer/HP-LaserJet_4L
-#gptofoo pcl-4 printer/HP-LaserJet_4M
-#gptofoo pcl-4 printer/HP-LaserJet_4ML
-#gptofoo pcl-4 printer/HP-LaserJet_4P
+#gptofoo hp-lj_4m printer/HP-LaserJet_4M
+#gptofoo hp-lj_4ml printer/HP-LaserJet_4ML
+#gptofoo hp-lj_4p printer/HP-LaserJet_4P
 #gptofoo pcl-4si printer/HP-LaserJet_4Si
 #gptofoo pcl-4v printer/HP-LaserJet_4V
+#gptofoo hp-lj_4_plus printer/HP-LaserJet_4_Plus
 #gptofoo pcl-5 printer/HP-LaserJet_5
-#gptofoo pcl-4 printer/HP-LaserJet_5L
-#gptofoo pcl-4 printer/HP-LaserJet_5M
-#gptofoo pcl-4 printer/HP-LaserJet_5MP
-#gptofoo pcl-5 printer/HP-LaserJet_5P
+#gptofoo hp-lj_5000 printer/HP-LaserJet_5000
+#gptofoo hp-lj_5100 printer/HP-LaserJet_5100
+#gptofoo hp-lj_5l printer/HP-LaserJet_5L
+#gptofoo hp-lj_5m printer/HP-LaserJet_5M
+#gptofoo hp-lj_5mp printer/HP-LaserJet_5MP
+#gptofoo hp-lj_5p printer/HP-LaserJet_5P
 #gptofoo pcl-5si printer/HP-LaserJet_5Si
 #gptofoo pcl-6 printer/HP-LaserJet_6
-#gptofoo pcl-4 printer/HP-LaserJet_6L
-#gptofoo pcl-4 printer/HP-LaserJet_6MP
-#gptofoo pcl-4 printer/HP-LaserJet_6P
-#gptofoo pcl-5 printer/HP-LaserJet_1010
-#gptofoo pcl-5 printer/HP-LaserJet_1012
-#gptofoo pcl-5 printer/HP-LaserJet_1015
-#gptofoo pcl-6 printer/HP-LaserJet_1100
-#gptofoo pcl-6 printer/HP-LaserJet_1100A
-#gptofoo pcl-6 printer/HP-LaserJet_1150
-#gptofoo pcl-6 printer/HP-LaserJet_1200
-#gptofoo pcl-6 printer/HP-LaserJet_1220
-#gptofoo pcl-6 printer/HP-LaserJet_1300
-#gptofoo pcl-6 printer/HP-LaserJet_2100
-#gptofoo pcl-6 printer/HP-LaserJet_2100M
-#gptofoo pcl-6 printer/HP-LaserJet_2200
-#gptofoo pcl-6 printer/HP-LaserJet_2300
-#gptofoo pcl-6 printer/HP-LaserJet_3200
-#gptofoo pcl-6 printer/HP-LaserJet_3200m
-#gptofoo pcl-6 printer/HP-LaserJet_3200se
-#gptofoo pcl-6 printer/HP-LaserJet_3300
-#gptofoo pcl-6 printer/HP-LaserJet_3310
-#gptofoo pcl-6 printer/HP-LaserJet_3320
-#gptofoo pcl-6 printer/HP-LaserJet_3320N
-#gptofoo pcl-6 printer/HP-LaserJet_3330
-#gptofoo pcl-6 printer/HP-LaserJet_4000
-#gptofoo pcl-6 printer/HP-LaserJet_4050
-#gptofoo pcl-6 printer/HP-LaserJet_4100
-#gptofoo pcl-6 printer/HP-LaserJet_4200
-#gptofoo pcl-6 printer/HP-LaserJet_4300
-#gptofoo pcl-6 printer/HP-LaserJet_5000
-#gptofoo pcl-6 printer/HP-LaserJet_5100
-#gptofoo pcl-6 printer/HP-LaserJet_8000
-#gptofoo pcl-6 printer/HP-LaserJet_8100
-#gptofoo pcl-6 printer/HP-LaserJet_8150
-#gptofoo pcl-6 printer/HP-LaserJet_9000
-#gptofoo pcl-6 printer/HP-Mopier_240
-#gptofoo pcl-6 printer/HP-Mopier_320
-#gptofoo pcl-520 printer/HP-OfficeJet
-#gptofoo pcl-520 printer/HP-OfficeJet_300
-#gptofoo pcl-520 printer/HP-OfficeJet_330
-#gptofoo pcl-520 printer/HP-OfficeJet_350
-#gptofoo pcl-601 printer/HP-OfficeJet_500
-#gptofoo pcl-601 printer/HP-OfficeJet_520
-#gptofoo pcl-601 printer/HP-OfficeJet_570
-#gptofoo pcl-601 printer/HP-OfficeJet_580
-#gptofoo pcl-601 printer/HP-OfficeJet_590
-#gptofoo pcl-601 printer/HP-OfficeJet_600
-#gptofoo pcl-601 printer/HP-OfficeJet_610
-#gptofoo pcl-601 printer/HP-OfficeJet_625
-#gptofoo pcl-601 printer/HP-OfficeJet_630
-#gptofoo pcl-601 printer/HP-OfficeJet_635
-#gptofoo pcl-690 printer/HP-OfficeJet_700
-#gptofoo pcl-690 printer/HP-OfficeJet_710
-#gptofoo pcl-690 printer/HP-OfficeJet_720
-#gptofoo pcl-690 printer/HP-OfficeJet_725
-#gptofoo pcl-900 printer/HP-OfficeJet_5105
-#gptofoo pcl-900 printer/HP-OfficeJet_5110
-#gptofoo pcl-900 printer/HP-OfficeJet_5110xi
-#gptofoo pcl-900 printer/HP-OfficeJet_6105
-#gptofoo pcl-900 printer/HP-OfficeJet_6110
-#gptofoo pcl-900 printer/HP-OfficeJet_7110
-#gptofoo pcl-900 printer/HP-OfficeJet_7130
-#gptofoo pcl-900 printer/HP-OfficeJet_7140
-#gptofoo pcl-900 printer/HP-OfficeJet_D125
-#gptofoo pcl-900 printer/HP-OfficeJet_D135
-#gptofoo pcl-900 printer/HP-OfficeJet_D145
-#gptofoo pcl-900 printer/HP-OfficeJet_D155
-#gptofoo pcl-900 printer/HP-OfficeJet_G55
-#gptofoo pcl-900 printer/HP-OfficeJet_G85
-#gptofoo pcl-900 printer/HP-OfficeJet_G95
-#gptofoo pcl-900 printer/HP-OfficeJet_K60
-#gptofoo pcl-900 printer/HP-OfficeJet_K60xi
-#gptofoo pcl-900 printer/HP-OfficeJet_K80
-#gptofoo pcl-900 printer/HP-OfficeJet_K80xi
-#gptofoo pcl-520 printer/HP-OfficeJet_LX
-#gptofoo pcl-850 printer/HP-OfficeJet_Pro_1150C
-#gptofoo pcl-890 printer/HP-OfficeJet_Pro_1170C
-#gptofoo pcl-890 printer/HP-OfficeJet_Pro_1175C
-#gptofoo pcl-840 printer/HP-OfficeJet_R40
-#gptofoo pcl-840 printer/HP-OfficeJet_R45
-#gptofoo pcl-840 printer/HP-OfficeJet_R60
-#gptofoo pcl-840 printer/HP-OfficeJet_R65
-#gptofoo pcl-840 printer/HP-OfficeJet_R80
-#gptofoo pcl-840 printer/HP-OfficeJet_T45
-#gptofoo pcl-840 printer/HP-OfficeJet_T65
-#gptofoo pcl-900 printer/HP-OfficeJet_V40
-#gptofoo pcl-900 printer/HP-OfficeJet_V40xi
-#gptofoo pcl-900 printer/HP-PhotoSmart_P100
-#gptofoo pcl-900 printer/HP-PhotoSmart_P130
-#gptofoo pcl-900 printer/HP-PhotoSmart_P230
+#gptofoo hp-lj_6l printer/HP-LaserJet_6L
+#gptofoo hp-lj_6mp printer/HP-LaserJet_6MP
+#gptofoo hp-lj_6p printer/HP-LaserJet_6P
+#gptofoo hp-lj_8000 printer/HP-LaserJet_8000
+#gptofoo hp-lj_8100 printer/HP-LaserJet_8100
+#gptofoo hp-lj_8150 printer/HP-LaserJet_8150
+#gptofoo hp-lj_9000 printer/HP-LaserJet_9000
+#gptofoo hp-mopier_240 printer/HP-Mopier_240
+#gptofoo hp-mopier_320 printer/HP-Mopier_320
+#gptofoo hp-oj printer/HP-OfficeJet
+#gptofoo hp-oj_300 printer/HP-OfficeJet_300
+#gptofoo hp-oj_330 printer/HP-OfficeJet_330
+#gptofoo hp-oj_350 printer/HP-OfficeJet_350
+#gptofoo hp-oj_500 printer/HP-OfficeJet_500
+#gptofoo hp-oj_5105 printer/HP-OfficeJet_5105
+#gptofoo hp-oj_5110 printer/HP-OfficeJet_5110
+#gptofoo hp-oj_5110xi printer/HP-OfficeJet_5110xi
+#gptofoo hp-oj_520 printer/HP-OfficeJet_520
+#gptofoo hp-oj_570 printer/HP-OfficeJet_570
+#gptofoo hp-oj_580 printer/HP-OfficeJet_580
+#gptofoo hp-oj_590 printer/HP-OfficeJet_590
+#gptofoo hp-oj_600 printer/HP-OfficeJet_600
+#gptofoo hp-oj_610 printer/HP-OfficeJet_610
+#gptofoo hp-oj_6105 printer/HP-OfficeJet_6105
+#gptofoo hp-oj_6110 printer/HP-OfficeJet_6110
+#gptofoo hp-oj_625 printer/HP-OfficeJet_625
+#gptofoo hp-oj_630 printer/HP-OfficeJet_630
+#gptofoo hp-oj_635 printer/HP-OfficeJet_635
+#gptofoo hp-oj_700 printer/HP-OfficeJet_700
+#gptofoo hp-oj_710 printer/HP-OfficeJet_710
+#gptofoo hp-oj_7110 printer/HP-OfficeJet_7110
+#gptofoo hp-oj_7130 printer/HP-OfficeJet_7130
+#gptofoo hp-oj_7140 printer/HP-OfficeJet_7140
+#gptofoo hp-oj_720 printer/HP-OfficeJet_720
+#gptofoo hp-oj_725 printer/HP-OfficeJet_725
+#gptofoo hp-oj_d125 printer/HP-OfficeJet_D125
+#gptofoo hp-oj_d135 printer/HP-OfficeJet_D135
+#gptofoo hp-oj_d145 printer/HP-OfficeJet_D145
+#gptofoo hp-oj_d155 printer/HP-OfficeJet_D155
+#gptofoo hp-oj_g55 printer/HP-OfficeJet_G55
+#gptofoo hp-oj_g85 printer/HP-OfficeJet_G85
+#gptofoo hp-oj_g95 printer/HP-OfficeJet_G95
+#gptofoo hp-oj_k60 printer/HP-OfficeJet_K60
+#gptofoo hp-oj_k60xi printer/HP-OfficeJet_K60xi
+#gptofoo hp-oj_k80 printer/HP-OfficeJet_K80
+#gptofoo hp-oj_k80xi printer/HP-OfficeJet_K80xi
+#gptofoo hp-oj_lx printer/HP-OfficeJet_LX
+#gptofoo hp-oj_pro_1150c printer/HP-OfficeJet_Pro_1150C
+#gptofoo hp-oj_pro_1170c printer/HP-OfficeJet_Pro_1170C
+#gptofoo hp-oj_pro_1175c printer/HP-OfficeJet_Pro_1175C
+#gptofoo hp-oj_r40 printer/HP-OfficeJet_R40
+#gptofoo hp-oj_r45 printer/HP-OfficeJet_R45
+#gptofoo hp-oj_r60 printer/HP-OfficeJet_R60
+#gptofoo hp-oj_r65 printer/HP-OfficeJet_R65
+#gptofoo hp-oj_r80 printer/HP-OfficeJet_R80
+#gptofoo hp-oj_t45 printer/HP-OfficeJet_T45
+#gptofoo hp-oj_t65 printer/HP-OfficeJet_T65
+#gptofoo hp-oj_v40 printer/HP-OfficeJet_V40
+#gptofoo hp-oj_v40xi printer/HP-OfficeJet_V40xi
+#gptofoo hp-psc_2110 printer/HP-PSC_2110
+#gptofoo hp-psc_2150 printer/HP-PSC_2150
+#gptofoo hp-psc_2210 printer/HP-PSC_2210
+#gptofoo hp-psc_370 printer/HP-PSC_370
+#gptofoo hp-psc_380 printer/HP-PSC_380
+#gptofoo hp-psc_500 printer/HP-PSC_500
+#gptofoo hp-psc_750 printer/HP-PSC_750
+#gptofoo hp-psc_950 printer/HP-PSC_950
+#gptofoo hp-psc_950xi printer/HP-PSC_950xi
+#gptofoo hp-psc_7150 printer/HP-PhotoSmart_7150
+#gptofoo hp-psc_7345 printer/HP-PhotoSmart_7345
+#gptofoo hp-psc_7350 printer/HP-PhotoSmart_7350
+#gptofoo hp-psc_7550 printer/HP-PhotoSmart_7550
+#gptofoo hp-psc_p100 printer/HP-PhotoSmart_P100
 #gptofoo pcl-P1000 printer/HP-PhotoSmart_P1000
 #gptofoo pcl-P1100 printer/HP-PhotoSmart_P1100
-#gptofoo pcl-900 printer/HP-PhotoSmart_P1115
-#gptofoo pcl-900 printer/HP-PhotoSmart_P1215
-#gptofoo pcl-900 printer/HP-PhotoSmart_P1218
-#gptofoo pcl-900 printer/HP-PhotoSmart_P1315
-#gptofoo pcl-900 printer/HP-PhotoSmart_7150
-#gptofoo pcl-900 printer/HP-PhotoSmart_7345
-#gptofoo pcl-900 printer/HP-PhotoSmart_7350
-#gptofoo pcl-900 printer/HP-PhotoSmart_7550
-#gptofoo pcl-690 printer/HP-PSC_370
-#gptofoo pcl-690 printer/HP-PSC_380
-#gptofoo pcl-840 printer/HP-PSC_500
-#gptofoo pcl-900 printer/HP-PSC_750
-#gptofoo pcl-900 printer/HP-PSC_950
-#gptofoo pcl-900 printer/HP-PSC_950xi
-#gptofoo pcl-900 printer/HP-PSC_2110
-#gptofoo pcl-900 printer/HP-PSC_2150
-#gptofoo pcl-900 printer/HP-PSC_2210
-#gptofoo pcl-2 printer/IBM-4019
-#gptofoo pcl-3 printer/IBM-4029_030_LaserPrinter_10
-#gptofoo pcl-2 printer/IBM-4312
-#gptofoo pcl-6 printer/IBM-Infoprint_12
-#gptofoo pcl-4 printer/IBM-Page_Printer_3112
-#gptofoo pcl-6 printer/Infotec-4651_MF
-#gptofoo pcl-2 printer/Kyocera-F-1010
-#gptofoo pcl-4 printer/Kyocera-FS-600
-#gptofoo pcl-4 printer/Kyocera-FS-600KPDL2
-#gptofoo pcl-4 printer/Kyocera-FS-680
-#gptofoo pcl-4 printer/Kyocera-FS-800
-#gptofoo pcl-4 printer/Kyocera-FS-1000
-#gptofoo pcl-4 printer/Kyocera-FS-1000plus
-#gptofoo pcl-4 printer/Kyocera-FS-1010
-#gptofoo pcl-4 printer/Kyocera-FS-1050
-#gptofoo pcl-4 printer/Kyocera-FS-1200
-#gptofoo pcl-4 printer/Kyocera-FS-1600
-#gptofoo pcl-4 printer/Kyocera-FS-1600plus
-#gptofoo pcl-4 printer/Kyocera-FS-1700
-#gptofoo pcl-4 printer/Kyocera-FS-1700plus
-#gptofoo pcl-4 printer/Kyocera-FS-1750
-#gptofoo pcl-4 printer/Kyocera-FS-1800
-#gptofoo pcl-4 printer/Kyocera-FS-1800plus
-#gptofoo pcl-4 printer/Kyocera-FS-1900
-#gptofoo pcl-3 printer/Kyocera-FS-3500
-#gptofoo pcl-4 printer/Kyocera-FS-3600
-#gptofoo pcl-4 printer/Kyocera-FS-3600plus
-#gptofoo pcl-4 printer/Kyocera-FS-3700
-#gptofoo pcl-4 printer/Kyocera-FS-3700plus
-#gptofoo pcl-6 printer/Kyocera-FS-3750
-#gptofoo pcl-4 printer/Kyocera-FS-3800
-#gptofoo pcl-4 printer/Kyocera-FS-5800C
-#gptofoo pcl-4 printer/Kyocera-FS-5900C
-#gptofoo pcl-3 printer/Kyocera-FS-6500
-#gptofoo pcl-3 printer/Kyocera-FS-6500plus
-#gptofoo pcl-4 printer/Kyocera-FS-6700
-#gptofoo pcl-4 printer/Kyocera-FS-7000
-#gptofoo pcl-4 printer/Kyocera-FS-7000plus
-#gptofoo pcl-4 printer/Kyocera-FS-8000C
-#gptofoo pcl-4 printer/Kyocera-FS-9000
-#gptofoo pcl-4 printer/Kyocera-FS-9100DN
-#gptofoo pcl-4 printer/Kyocera-FS-9500DN
-#gptofoo pcl-4 printer/Kyocera-KM-1530
-#gptofoo pcl-4 printer/Kyocera-KM-1810
-#gptofoo pcl-4 printer/Kyocera-KM-2030
-#gptofoo pcl-4 printer/Kyocera-KM-2530
-#gptofoo pcl-4 printer/Kyocera-KM-3530
-#gptofoo pcl-4 printer/Kyocera-KM-4230
-#gptofoo pcl-4 printer/Kyocera-KM-4530
-#gptofoo pcl-4 printer/Kyocera-KM-5230
-#gptofoo pcl-4 printer/Kyocera-KM-5530
-#gptofoo pcl-4 printer/Kyocera-KM-6230
+#gptofoo hp-psc_p1115 printer/HP-PhotoSmart_P1115
+#gptofoo hp-psc_p1215 printer/HP-PhotoSmart_P1215
+#gptofoo hp-psc_p1218 printer/HP-PhotoSmart_P1218
+#gptofoo hp-psc_p130 printer/HP-PhotoSmart_P130
+#gptofoo hp-psc_p1315 printer/HP-PhotoSmart_P1315
+#gptofoo hp-psc_p230 printer/HP-PhotoSmart_P230
+#gptofoo hp-e-printer_e20 printer/HP-e-printer_e20
+#gptofoo ibm-4019 printer/IBM-4019
+#gptofoo ibm-4029_030_lp_10 printer/IBM-4029_030_LaserPrinter_10
+#gptofoo ibm-4312 printer/IBM-4312
+#gptofoo ibm-infoprint_12 printer/IBM-Infoprint_12
+#gptofoo ibm-pp_3112 printer/IBM-Page_Printer_3112
+#gptofoo infotec-4651_mf printer/Infotec-4651_MF
+#gptofoo kyocera-f-1010 printer/Kyocera-F-1010
+#gptofoo kyocera-fs-1000 printer/Kyocera-FS-1000
+#gptofoo kyocera-fs-1000plus printer/Kyocera-FS-1000plus
+#gptofoo kyocera-fs-1010 printer/Kyocera-FS-1010
+#gptofoo kyocera-fs-1050 printer/Kyocera-FS-1050
+#gptofoo kyocera-fs-1200 printer/Kyocera-FS-1200
+#gptofoo kyocera-fs-1600 printer/Kyocera-FS-1600
+#gptofoo kyocera-fs-1600plus printer/Kyocera-FS-1600plus
+#gptofoo kyocera-fs-1700 printer/Kyocera-FS-1700
+#gptofoo kyocera-fs-1700plus printer/Kyocera-FS-1700plus
+#gptofoo kyocera-fs-1750 printer/Kyocera-FS-1750
+#gptofoo kyocera-fs-1800 printer/Kyocera-FS-1800
+#gptofoo kyocera-fs-1800plus printer/Kyocera-FS-1800plus
+#gptofoo kyocera-fs-1900 printer/Kyocera-FS-1900
+#gptofoo kyocera-fs-3500 printer/Kyocera-FS-3500
+#gptofoo kyocera-fs-3600 printer/Kyocera-FS-3600
+#gptofoo kyocera-fs-3600plus printer/Kyocera-FS-3600plus
+#gptofoo kyocera-fs-3700 printer/Kyocera-FS-3700
+#gptofoo kyocera-fs-3700plus printer/Kyocera-FS-3700plus
+#gptofoo kyocera-fs-3750 printer/Kyocera-FS-3750
+#gptofoo kyocera-fs-3800 printer/Kyocera-FS-3800
+#gptofoo kyocera-fs-5800c printer/Kyocera-FS-5800C
+#gptofoo kyocera-fs-5900c printer/Kyocera-FS-5900C
+#gptofoo kyocera-fs-600 printer/Kyocera-FS-600
+#gptofoo kyocera-fs-600_kpdl-2 printer/Kyocera-FS-600_KPDL-2
+#gptofoo kyocera-fs-6500 printer/Kyocera-FS-6500
+#gptofoo kyocera-fs-6500plus printer/Kyocera-FS-6500plus
+#gptofoo kyocera-fs-6700 printer/Kyocera-FS-6700
+#gptofoo kyocera-fs-680 printer/Kyocera-FS-680
+#gptofoo kyocera-fs-7000 printer/Kyocera-FS-7000
+#gptofoo kyocera-fs-7000plus printer/Kyocera-FS-7000plus
+#gptofoo kyocera-fs-800 printer/Kyocera-FS-800
+#gptofoo kyocera-fs-8000c printer/Kyocera-FS-8000C
+#gptofoo kyocera-fs-9000 printer/Kyocera-FS-9000
+#gptofoo kyocera-fs-9100dn printer/Kyocera-FS-9100DN
+#gptofoo kyocera-fs-9500dn printer/Kyocera-FS-9500DN
+#gptofoo kyocera-km-1530 printer/Kyocera-KM-1530
+#gptofoo kyocera-km-1810 printer/Kyocera-KM-1810
+#gptofoo kyocera-km-2030 printer/Kyocera-KM-2030
+#gptofoo kyocera-km-2530 printer/Kyocera-KM-2530
+#gptofoo kyocera-km-3530 printer/Kyocera-KM-3530
+#gptofoo kyocera-km-4230 printer/Kyocera-KM-4230
+#gptofoo kyocera-km-4530 printer/Kyocera-KM-4530
+#gptofoo kyocera-km-5230 printer/Kyocera-KM-5230
+#gptofoo kyocera-km-5530 printer/Kyocera-KM-5530
+#gptofoo kyocera-km-6230 printer/Kyocera-KM-6230
 #gptofoo lexmark-4076 printer/Lexmark-4076
-#gptofoo pcl-4 printer/Lexmark-Optra_E
-#gptofoo pcl-4 printer/Lexmark-Optra_Eplus
-#gptofoo pcl-2 printer/Lexmark-Valuewriter_300
+#gptofoo lexmark-optra_e printer/Lexmark-Optra_E
+#gptofoo lexmark-optra_eplus printer/Lexmark-Optra_Eplus
+#gptofoo lexmark-vw_300 printer/Lexmark-Valuewriter_300
 #gptofoo lexmark-z42 printer/Lexmark-Z42
 #gptofoo lexmark-z43 printer/Lexmark-Z43
 #gptofoo lexmark-z52 printer/Lexmark-Z52
 #gptofoo lexmark-z53 printer/Lexmark-Z53
-#gptofoo pcl-4 printer/Minolta-PagePro_6
-#gptofoo pcl-4 printer/Minolta-PagePro_6e
-#gptofoo pcl-4 printer/Minolta-PagePro_6ex
-#gptofoo pcl-4 printer/Minolta-PagePro_8
-#gptofoo pcl-2 printer/Minolta-PagePro_8L
-#gptofoo pcl-6 printer/Minolta-PagePro_1100
-#gptofoo pcl-4 printer/NEC-SuperScript_660i
-#gptofoo pcl-2 printer/NEC-SuperScript_860
-#gptofoo pcl-2 printer/NEC-SuperScript_870
-#gptofoo pcl-2 printer/NEC-SuperScript_1260
-#gptofoo pcl-4 printer/NEC-SuperScript_1400
-#gptofoo pcl-4 printer/NEC-SuperScript_1800
-#gptofoo pcl-2 printer/Okidata-OL400
-#gptofoo pcl-2 printer/Okidata-OL400e
-#gptofoo pcl-2 printer/Okidata-OL400ex
-#gptofoo pcl-4 printer/Okidata-OL410e
-#gptofoo pcl-2 printer/Okidata-OL600e
-#gptofoo pcl-2 printer/Okidata-OL610e_S
-#gptofoo pcl-2 printer/Okidata-OL800
-#gptofoo pcl-4 printer/Okidata-OL810ex
-#gptofoo pcl-4 printer/Okidata-Okipage_6e
-#gptofoo pcl-4 printer/Okidata-Okipage_6ex
-#gptofoo pcl-4 printer/Okidata-Okipage_8p
-#gptofoo pcl-4 printer/Okidata-Okipage_10e
-#gptofoo pcl-4 printer/Okidata-Okipage_10ex
-#gptofoo pcl-4 printer/Okidata-Okipage_14ex
-#gptofoo pcl-4l printer/Okidata-Super_6e
-#gptofoo pcl-2 printer/Olivetti-JP350S
-#gptofoo pcl-2 printer/Olivetti-PG_306
+#gptofoo minolta-pp_1100 printer/Minolta-PagePro_1100
+#gptofoo minolta-pp_6 printer/Minolta-PagePro_6
+#gptofoo minolta-pp_6e printer/Minolta-PagePro_6e
+#gptofoo minolta-pp_6ex printer/Minolta-PagePro_6ex
+#gptofoo minolta-pp_8 printer/Minolta-PagePro_8
+#gptofoo minolta-pp_8l printer/Minolta-PagePro_8L
+#gptofoo nec-ssc_1260 printer/NEC-SuperScript_1260
+#gptofoo nec-ssc_1400 printer/NEC-SuperScript_1400
+#gptofoo nec-ssc_1800 printer/NEC-SuperScript_1800
+#gptofoo nec-ssc_660i printer/NEC-SuperScript_660i
+#gptofoo nec-ssc_860 printer/NEC-SuperScript_860
+#gptofoo nec-ssc_870 printer/NEC-SuperScript_870
+#gptofoo okidata-ol400 printer/Okidata-OL400
+#gptofoo okidata-ol400e printer/Okidata-OL400e
+#gptofoo okidata-ol400ex printer/Okidata-OL400ex
+#gptofoo okidata-ol410e printer/Okidata-OL410e
+#gptofoo okidata-ol600e printer/Okidata-OL600e
+#gptofoo okidata-ol610e_s printer/Okidata-OL610e_S
+#gptofoo okidata-ol800 printer/Okidata-OL800
+#gptofoo okidata-ol810ex printer/Okidata-OL810ex
+#gptofoo okidata-okp_10e printer/Okidata-Okipage_10e
+#gptofoo okidata-okp_10ex printer/Okidata-Okipage_10ex
+#gptofoo okidata-okp_14ex printer/Okidata-Okipage_14ex
+#gptofoo okidata-okp_6e printer/Okidata-Okipage_6e
+#gptofoo okidata-okp_6ex printer/Okidata-Okipage_6ex
+#gptofoo okidata-okp_8p printer/Okidata-Okipage_8p
+#gptofoo okidata-super_6e printer/Okidata-Super_6e
+#gptofoo olivetti-jp350s printer/Olivetti-JP350S
+#gptofoo olivetti-pg_306 printer/Olivetti-PG_306
 #gptofoo olympus-p10 printer/Olympus-P-10
-#gptofoo olympus-p10 printer/Olympus-P-11
+#gptofoo olympus-p11 printer/Olympus-P-11
 #gptofoo olympus-p200 printer/Olympus-P-200
-#gptofoo olympus-p300 printer/Olympus-P-300E
-#gptofoo olympus-p300 printer/Olympus-P-300U
-#gptofoo olympus-p300 printer/Olympus-P-330E
-#gptofoo olympus-p300 printer/Olympus-P-330NE
+#gptofoo olympus-p300 printer/Olympus-P-300
+#gptofoo olympus-p300e printer/Olympus-P-300E
+#gptofoo olympus-p300u printer/Olympus-P-300U
+#gptofoo olympus-p330e printer/Olympus-P-330E
+#gptofoo olympus-p330ne printer/Olympus-P-330NE
 #gptofoo olympus-p400 printer/Olympus-P-400
 #gptofoo olympus-p440 printer/Olympus-P-440
-#gptofoo pcl-2 printer/PCPI-1030
-#gptofoo pcl-2 printer/Panasonic-KX-P4410
-#gptofoo pcl-3 printer/Panasonic-KX-P4450
-#gptofoo pcl-2 printer/Panasonic-KX-P6150
-#gptofoo pcl-2 printer/Panasonic-KX-P6500
-#gptofoo pcl-2 printer/Raven-LP-410
-#gptofoo pcl-6 printer/Ricoh-Aficio_220
-#gptofoo pcl-4 printer/Ricoh-Aficio_401
-#gptofoo pcl-4 printer/Ricoh-Aficio_700
-#gptofoo pcl-4 printer/Samsung-ML-85
-#gptofoo pcl-6 printer/Samsung-ML-4600
-#gptofoo pcl-4 printer/Samsung-ML-5000a
-#gptofoo pcl-4 printer/Samsung-ML-6000
-#gptofoo pcl-4 printer/Samsung-ML-6100
-#gptofoo pcl-6 printer/Samsung-ML-7000
-#gptofoo pcl-6 printer/Samsung-ML-7000P
-#gptofoo pcl-6 printer/Samsung-ML-7000N
-#gptofoo pcl-6 printer/Samsung-ML-7050
-#gptofoo pcl-4 printer/Samsung-QL-5100A
-#gptofoo pcl-4 printer/Samsung-QL-6050
-#gptofoo pcl-2 printer/Seiko-SpeedJET_200
-#gptofoo pcl-6 printer/Sharp-AR-161
-#gptofoo pcl-601 printer/Sony-IJP-V100
+#gptofoo pcpi-1030 printer/PCPI-1030
+#gptofoo panasonic-kx-p4410 printer/Panasonic-KX-P4410
+#gptofoo panasonic-kx-p4450 printer/Panasonic-KX-P4450
+#gptofoo panasonic-kx-p6150 printer/Panasonic-KX-P6150
+#gptofoo panasonic-kx-p6500 printer/Panasonic-KX-P6500
+#gptofoo raven-lp-410 printer/Raven-LP-410
+#gptofoo ricoh-afc_220 printer/Ricoh-Aficio_220
+#gptofoo ricoh-afc_401 printer/Ricoh-Aficio_401
+#gptofoo ricoh-afc_700 printer/Ricoh-Aficio_700
+#gptofoo samsung-ml-4600 printer/Samsung-ML-4600
+#gptofoo samsung-ml-5000a printer/Samsung-ML-5000a
+#gptofoo samsung-ml-6000 printer/Samsung-ML-6000
+#gptofoo samsung-ml-6100 printer/Samsung-ML-6100
+#gptofoo samsung-ml-7000 printer/Samsung-ML-7000
+#gptofoo samsung-ml-7000n printer/Samsung-ML-7000N
+#gptofoo samsung-ml-7000p printer/Samsung-ML-7000P
+#gptofoo samsung-ml-7050 printer/Samsung-ML-7050
+#gptofoo samsung-ml-85 printer/Samsung-ML-85
+#gptofoo samsung-ql-5100a printer/Samsung-QL-5100A
+#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 sony-ijp-v100 printer/Sony-IJP-V100
 #gptofoo sony-updp10 printer/Sony-UP-DP10
 #gptofoo sony-updr150 printer/Sony-UP-DR150
-#gptofoo pcl-2 printer/Star-LS-04
-#gptofoo pcl-2 printer/Star-LaserPrinter_8
-#gptofoo pcl-3 printer/Tally-MT908
-#gptofoo pcl-4 printer/Xerox-Able_1406
-#gptofoo pcl-4 printer/Xerox-DocuPrint_4508
-#gptofoo pcl-4 printer/Xerox-DocuPrint_N4512
-#gptofoo pcl-4 printer/Xerox-DocuPrint_N4512PS
-#gptofoo pcl-2 printer/Xerox-DocuPrint_P12
-#gptofoo pcl-6 printer/Xerox-DocuPrint_P1202
-#gptofoo pcl-4 printer/Xerox-DocuPrint_C20
-#gptofoo pcl-4 printer/Xerox-DocuPrint_P8e
-#gptofoo pcl-4 printer/Xerox-Document_Centre_400
-#gptofoo pcl-2 printer/Generic-PCL_4_Printer
-#gptofoo pcl-3 printer/Generic-PCL_5_Printer
-#gptofoo pcl-4 printer/Generic-PCL_5c_Printer
-#gptofoo pcl-4 printer/Generic-PCL_5e_Printer
-#gptofoo pcl-6 printer/Generic-PCL_6_PCL_XL_Printer
+#gptofoo star-ls-04 printer/Star-LS-04
+#gptofoo star-lp_8 printer/Star-LaserPrinter_8
+#gptofoo tally-mt908 printer/Tally-MT908
+#gptofoo xerox-able_1406 printer/Xerox-Able_1406
+#gptofoo xerox-dp_4508 printer/Xerox-DocuPrint_4508
+#gptofoo xerox-dp_c20 printer/Xerox-DocuPrint_C20
+#gptofoo xerox-dp_n4512 printer/Xerox-DocuPrint_N4512
+#gptofoo xerox-dp_n4512ps printer/Xerox-DocuPrint_N4512PS
+#gptofoo xerox-dp_p12 printer/Xerox-DocuPrint_P12
+#gptofoo xerox-dp_p1202 printer/Xerox-DocuPrint_P1202
+#gptofoo xerox-dp_p8e printer/Xerox-DocuPrint_P8e
+#gptofoo xerox-dc_400 printer/Xerox-Document_Centre_400
diff --git a/src/foomatic/foomatic-templates-ijs/gutenprint.xml b/src/foomatic/foomatic-templates-ijs/gutenprint.xml
index f5cb082..399dd8d 100644
--- a/src/foomatic/foomatic-templates-ijs/gutenprint.xml
+++ b/src/foomatic/foomatic-templates-ijs/gutenprint.xml
@@ -8,13 +8,9 @@
  <comments>
   <en>
 
-    &lt;b&gt;This page provides data for the IJS driver of the
-    Gutenprint 5.0 series, if you are using the GhostScript
-    (&quot;stp&quot;) driver of the Gimp-Print 4.3.x series, go to the
-    &quot;&lt;a
-    href=&quot;show_driver.cgi?driver=gimp-print-unstable&quot;&gt;gimp-print-unstable&lt;/a&gt;&quot;
-    page, if you are using the IJS
-    driver of the Gimp-Print 4.2.x series, go to the
+    &lt;b&gt;This page provides data for the IJS driver of Gutenprint
+    5.0.  If you are using a Gimp-Print 4.2 release (e. g. 4.2.7),
+    driver of the Gimp-Print 4.2.x series, please visit the
     &quot;&lt;a
     href=&quot;show_driver.cgi?driver=gimp-print-ijs&quot;&gt;gimp-print-ijs&lt;/a&gt;&quot;
     page, and if you are using Gimp-Print 4.0.x, go to the &quot;&lt;a
@@ -24,11 +20,11 @@
     Gutenprint supports a wide variety of Epson Stylus, HP DeskJet,
     LaserJet, Canon BubbleJet, Lexmark inkjet printers, with the
     primary goal being uncompromising quality.  Epson Stylus printers
-    in particular are supported in all resolutions and modes, and the
-    latest printers are capable of producing prints that rival
-    photographic prints in quality. This package also offers much
-    faster printing for high quality text and presentation graphics
-    when required.&lt;p&gt;
+    in particular are supported in all resolutions and modes, and many
+    models are capable of producing prints that rival photographic
+    prints in quality.  This package also offers much faster printing
+    for high quality text and presentation graphics when
+    required.&lt;p&gt;
 
     The execution information currently here corresponds to driver
     version @@STPVER@@. If you use another version, use the Foomatic
@@ -38,9 +34,10 @@
     IJS driver of Gutenprint. For the native CUPS driver there
     are special PPD files provided by the Gutenprint package.&lt;p&gt;
 
-    This driver does not require patching and rebuilding GhostScript.
-    It is enough when you have an IJS enabled GhostScript (GNU
-    GhostScript 6.53 or newer, APFL GhostScript 7.04 or newer.&lt;p&gt;
+    This driver is built as an IJS driver, which does not require
+    recompiling Ghostscript.  It requires an IJS enabled GhostScript
+    (GNU GhostScript 6.53 or newer, APFL GhostScript 7.04 or
+    newer).&lt;p&gt;
 
   </en>
  </comments>
diff --git a/src/foomatic/printer_margins.c b/src/foomatic/printer_margins.c
index fef4d6f..89c68ed 100644
--- a/src/foomatic/printer_margins.c
+++ b/src/foomatic/printer_margins.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_margins.c,v 1.15 2004/09/17 18:38:12 rleigh Exp $"
+ * "$Id: printer_margins.c,v 1.17 2006/04/17 02:06:18 rlk Exp $"
  *
  *   Dump the per-printer margins for Grant Taylor's *-omatic database
  *
@@ -31,6 +31,9 @@
 int
 main(int argc, char **argv) {
   int i, k;
+  int use_all_page_sizes = 1;
+  if (argc > 1 && !strcmp(argv[1], "-s"))
+    use_all_page_sizes = 0;
 
   stp_init();
   for (i = 0; i < stp_printer_model_count(); i++) {
@@ -71,6 +74,10 @@ main(int argc, char **argv) {
 	printf("Unable to lookup size %s!\n", opt->name);
 	continue;
       }
+      if (!use_all_page_sizes && num_opts >= 10 &&
+	  (papersize->paper_unit == PAPERSIZE_ENGLISH_EXTENDED ||
+	   papersize->paper_unit == PAPERSIZE_METRIC_EXTENDED))
+	continue;
       
       width  = papersize->width;
       height = papersize->height;
@@ -78,7 +85,17 @@ main(int argc, char **argv) {
       stp_set_string_parameter(pv, "PageSize", opt->name);
       
       stp_get_media_size(pv, &width, &height);
-      stp_get_imageable_area(pv, &left, &right, &bottom, &top);
+      stp_get_maximum_imageable_area(pv, &left, &right, &bottom, &top);
+
+      if (left < 0)
+	left = 0;
+      if (right > width)
+	right = width;
+      if (bottom > height)
+	bottom = height;
+      if (top < 0)
+	top = 0;
+      
       bottom = height - bottom;
       top    = height - top;
 
diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c
index 53fed4c..6c1a9ba 100644
--- a/src/foomatic/printer_options.c
+++ b/src/foomatic/printer_options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_options.c,v 1.48 2005/08/10 11:29:46 rlk Exp $"
+ * "$Id: printer_options.c,v 1.49 2006/03/13 13:29:02 rlk Exp $"
  *
  *   Dump the per-printer options for Grant Taylor's *-omatic database
  *
@@ -32,6 +32,9 @@ int
 main(int argc, char **argv)
 {
   int i, j, k;
+  stp_parameter_level_t max_level = STP_PARAMETER_LEVEL_ADVANCED4;
+  if (argc > 1 && !strcmp(argv[1], "-s"))
+    max_level = STP_PARAMETER_LEVEL_BASIC;
 
   stp_init();
   for (i = 0; i < stp_printer_model_count(); i++)
@@ -71,7 +74,8 @@ main(int argc, char **argv)
       for (k = 0; k < nparams; k++)
 	{
 	  const stp_parameter_t *p = stp_parameter_list_param(params, k);
-	  if (p->read_only || p->p_level > STP_PARAMETER_LEVEL_ADVANCED4 ||
+	  if (p->read_only ||
+	      (p->p_level > max_level && strcmp(p->name, "Resolution") != 0) ||
 	      (p->p_class != STP_PARAMETER_CLASS_OUTPUT &&
 	       p->p_class != STP_PARAMETER_CLASS_FEATURE))
 	    continue;
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 4db2b1d..c8b76b5 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -267,6 +270,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -592,9 +596,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index 0a11d25..80167eb 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.11 2005/10/18 02:08:16 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.14 2006/04/19 03:24:26 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -43,6 +43,7 @@
 
 static int stp_debug = 1;
 volatile int SDEBUG = 1;
+static int job_aborted = 0;
 
 #define STP_DEBUG(x)				\
 do						\
@@ -75,6 +76,10 @@ typedef struct _IMAGE
   int xres;		/* dpi */
   int yres;
   int output_type;
+  int left_margin;
+  int right_margin;
+  int top_margin;
+  int bottom_margin;
   int monochrome_flag;	/* for monochrome output */
   int row;		/* row number in buffer */
   int row_width;	/* length of a row */
@@ -99,10 +104,13 @@ ijsgutenprint: the version of Gutenprint software installed (%s)\n\
 ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does not match the PPD file (%s).\n");
 
 const char *gutenprint_ppd_version = NULL;
+static int ppd_mode = 0;	/* Use PPD-style margins */
 
 static stp_string_list_t *option_remap_list = NULL;
 static int print_messages_as_errors = 0;
 
+static double total_bytes_printed = 0;
+
 static char *
 c_strdup(const char *s)
 {
@@ -505,7 +513,23 @@ gutenprint_get_cb (void *get_cb_data,
     {
       int l, r, b, t;
       int h, w;
-      stp_get_imageable_area(v, &l, &r, &b, &t);
+      if (ppd_mode)
+	{
+	  stp_get_media_size(v, &w, &h);
+	  stp_get_maximum_imageable_area(v, &l, &r, &b, &t);
+	  if (l < 0)
+	    l = 0;
+	  if (r > w)
+	    r = w;
+	  if (t < 0)
+	    t = 0;
+	  if (b > h)
+	    b = h;
+	}
+      else
+	stp_get_imageable_area(v, &l, &r, &b, &t);
+      
+
       h = b - t;
       w = r - l;
       /* Force locale to "C", because decimal numbers sent to the IJS
@@ -533,7 +557,20 @@ gutenprint_get_cb (void *get_cb_data,
       int l, r, b, t;
       int h, w;
       stp_get_media_size(v, &w, &h);
-      stp_get_imageable_area(v, &l, &r, &b, &t);
+      if (ppd_mode)
+	{
+	  stp_get_maximum_imageable_area(v, &l, &r, &b, &t);
+	  if (l < 0)
+	    l = 0;
+	  if (r > w)
+	    r = w;
+	  if (t < 0)
+	    t = 0;
+	  if (b > h)
+	    b = h;
+	}
+      else
+	stp_get_imageable_area(v, &l, &r, &b, &t);
       /* Force locale to "C", because decimal numbers sent to the IJS
 	 client must have a decimal point, nver a decimal comma */
       setlocale(LC_ALL, "C");
@@ -623,8 +660,25 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
     {
       int l, r, b, t, pw, ph;
       double w, h;
-      stp_get_imageable_area(img->v, &l, &r, &b, &t);
       stp_get_media_size(img->v, &pw, &ph);
+      if (ppd_mode)
+	{
+	  stp_get_maximum_imageable_area(img->v, &l, &r, &b, &t);
+	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: l %d r %d t %d b %d pw %d ph %d\n",
+			    l, r, t, b, pw, ph));
+	  if (l < 0)
+	    l = 0;
+	  if (r > pw)
+	    r = pw;
+	  if (t < 0)
+	    t = 0;
+	  if (b > ph)
+	    b = ph;
+	}
+      else
+	stp_get_imageable_area(img->v, &l, &r, &b, &t);
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint ppd_mode %d top left: %s\n",
+			ppd_mode, vbuf));
       STP_DEBUG(fprintf(stderr, "ijsgutenprint: l %d r %d t %d b %d pw %d ph %d\n",
 			l, r, t, b, pw, ph));
       code = gutenprint_parse_wxh(vbuf, strlen(vbuf), &w, &h);
@@ -686,6 +740,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
     }
   else if (strcmp(key, "STP_VERSION") == 0)
     {
+      ppd_mode = 1;
       if (strcmp(vbuf, version_id) != 0)
 	{
 	  fprintf(stderr, _(version_mismatch),
@@ -840,6 +895,7 @@ gutenprint_errfunc(void *file, const char *buf, size_t bytes)
 static void
 gutenprint_outfunc(void *data, const char *buffer, size_t bytes)
 {
+  total_bytes_printed += bytes;
   if ((data != NULL) && (buffer != NULL) && (bytes != 0))
     fwrite(buffer, 1, bytes, (FILE *)data);
 }
@@ -851,6 +907,7 @@ static int
 gutenprint_image_width(stp_image_t *image)
 {
   IMAGE *img = (IMAGE *)(image->rep);
+  STP_DEBUG(fprintf(stderr, "ijsgutenprint: image width %d\n", img->width));
   return img->width;
 }
 
@@ -858,9 +915,26 @@ static int
 gutenprint_image_height(stp_image_t *image)
 {
   IMAGE *img = (IMAGE *)(image->rep);
+  STP_DEBUG(fprintf(stderr, "ijsgutenprint: image height %d (%d)\n",
+		    img->height, img->height * img->xres / img->yres));
   return img->height * img->xres / img->yres;
 }
 
+static void
+throwaway_data(int amount, IMAGE *img)
+{
+  char trash[4096];	/* Throwaway */
+  int block_count = amount / 4096;
+  int leftover = amount % 4096;
+  while (block_count > 0)
+    {
+      ijs_server_get_data(img->ctx, trash, 4096);
+      block_count--;
+    }
+  if (leftover)
+    ijs_server_get_data(img->ctx, trash, leftover);
+}
+
 static int
 image_next_row(IMAGE *img)
 {
@@ -875,16 +949,21 @@ image_next_row(IMAGE *img)
       STP_DEBUG(fprintf(stderr, "ijsgutenprint: %.0f bytes left, reading %.d, on row %d\n",
 			img->bytes_left, (int) n_bytes, img->row));
 #endif
+      throwaway_data(img->left_margin, img);
       status = ijs_server_get_data(img->ctx, img->row_buf, (int) n_bytes);
       if (status)
 	{
-	  STP_DEBUG(fprintf(stderr, "ERROR: ijsgutenprint: page aborted!\n"));
+	  STP_DEBUG(fprintf(stderr, "ERROR: ijsgutenprint: page aborted (%d) at line %d!\n",
+			    status, img->row));
+	  job_aborted = 1;
+	  return status;
 	}
       else
 	{
 	  img->row++;
-	  img->bytes_left -= n_bytes;
+	  img->bytes_left -= (n_bytes + img->right_margin + img->left_margin);
 	}
+      throwaway_data(img->right_margin, img);
     }
   else
     return 1;	/* Done */
@@ -1027,7 +1106,7 @@ purge_unused_float_parameters(stp_vars_t *v)
   int i;
   stp_parameter_list_t params = stp_get_parameter_list(v);
   size_t count = stp_parameter_list_count(params);
-  STP_DEBUG(fprintf(stderr, "ijsgutenprint: Purging unused floating point parameters"));
+  STP_DEBUG(fprintf(stderr, "ijsgutenprint: Purging unused floating point parameters\n"));
   for (i = 0; i < count; i++)
     {
       const stp_parameter_t *param = stp_parameter_list_param(params, i);
@@ -1209,19 +1288,11 @@ main (int argc, char **argv)
 
   STP_DEBUG(stp_dbg("ijsgutenprint: about to start\n", img.v));
 
-  do
+  STP_DEBUG(fprintf(stderr, "ijsgutenprint: About to get page header\n"));
+  status = ijs_server_get_page_header(img.ctx, &ph);
+  while (status == 0)
     {
-
-      STP_DEBUG(fprintf(stderr, "ijsgutenprint: About to get page header\n"));
-      status = ijs_server_get_page_header(img.ctx, &ph);
-      STP_DEBUG(fprintf(stderr, "ijsgutenprint: Got page header %d\n", status));
-      if (status)
-	{
-	  if (status < 0)
-	    fprintf(stderr, _("ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"),
-		    status);
-	  break;
-	}
+      stp_vars_t *old_v = NULL;
       STP_DEBUG(fprintf(stderr, "ijsgutenprint: got page header, %d x %d\n",
 			ph.width, ph.height));
       STP_DEBUG(stp_dbg("ijsgutenprint: have page header\n", img.v));
@@ -1281,6 +1352,81 @@ main (int argc, char **argv)
       stp_set_float_parameter(img.v, "AppGamma", 1.0);
       stp_get_media_size(img.v, &w, &h);
       stp_get_imageable_area(img.v, &l, &r, &b, &t);
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+			ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+			stp_get_height(img.v), img.height));
+      if (ppd_mode)
+	{
+	  int lt, rt, bt, tt;
+
+	  stp_get_maximum_imageable_area(img.v, &lt, &rt, &bt, &tt);
+	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: w %d h %d l %d %d t %d %d r %d %d b %d %d\n",
+			    w, h, l, lt, t, tt, r, rt, b, bt));
+	  if (lt < 0)
+	    lt = 0;
+	  if (tt < 0)
+	    tt = 0;
+	  if (rt > w)
+	    rt = w;
+	  if (bt > h)
+	    bt = h;
+	  if (l < 0)
+	    l = 0;
+	  if (t < 0)
+	    t = 0;
+	  if (r > w + l)
+	    r = w + l;
+	  if (b > h + t)
+	    b = h + t;
+	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: w %d h %d l %d %d t %d %d r %d %d b %d %d\n",
+			    w, h, l, lt, t, tt, r, rt, b, bt));
+	  if (lt < l)
+	    {
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: l %d, lt %d\n", l, lt));
+	      img.left_margin = (l - lt) * ph.xres * ph.n_chan * ph.bps / 8 / 72;
+	      img.width -= (l - lt) * ph.xres / 72;
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+				ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+				stp_get_height(img.v), img.height));
+	    }
+	  else
+	    img.left_margin = 0;
+	  stp_set_left(img.v, l);
+	  if (tt < t)
+	    {
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: t %d, tt %d\n", t, tt));
+	      img.top_margin = (t - tt) * ph.yres * ph.n_chan * ph.bps / 8 / 72;
+	      img.height -= (t - tt) * ph.yres / 72;
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+				ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+				stp_get_height(img.v), img.height));
+	    }
+	  else
+	    img.top_margin = 0;
+	  stp_set_top(img.v, t);
+	  if (rt > r)
+	    {
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: r %d, rt %d\n", r, rt));
+	      img.right_margin = (rt - r) * ph.xres * ph.n_chan * ph.bps / 8 / 72;
+	      img.width -= (rt - r) * ph.xres / 72;
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+				ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+				stp_get_height(img.v), img.height));
+	    }
+	  else
+	    img.right_margin = 0;
+	  if (bt > b)
+	    {
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: b %d, bt %d\n", b, bt));
+	      img.bottom_margin = (bt - b) * ph.yres * ph.n_chan * ph.bps / 8 / 72;
+	      img.height -= (bt - b) * ph.yres / 72;
+	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+				ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+				stp_get_height(img.v), img.height));
+	    }
+	  else
+	    img.bottom_margin = 0;
+	}
       if (l < 0)
 	width = r;
       else
@@ -1290,8 +1436,19 @@ main (int argc, char **argv)
 	height = b;
       else
 	height = b - t;
+      img.row_width -= img.left_margin;
+      img.row_width -= img.right_margin;
       stp_set_height(img.v, height);
       stp_set_int_parameter(img.v, "PageNumber", page);
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: w %d h %d l %d r %d t %d b %d\n",
+			width, height, l, r, t, b));
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: chan %d bps %d image w %d %d h %d %d\n",
+			ph.n_chan, ph.bps, stp_get_width(img.v), img.width,
+			stp_get_height(img.v), img.height));
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: margins l %d r %d t %d b %d row width %d\n",
+			img.left_margin, img.right_margin,
+			img.top_margin, img.bottom_margin,
+			img.row_width));
 
 /* 
  * Fix up the duplex/tumble settings stored in the "x_" parameters
@@ -1327,6 +1484,10 @@ main (int argc, char **argv)
 
       validate_options(&si);
       STP_DEBUG(stp_dbg("ijsgutenprint: about to print", img.v));
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: w %d h %d l %d t %d\n",
+			stp_get_width(img.v), stp_get_height(img.v),
+			stp_get_left(img.v), stp_get_top(img.v)));
+      STP_DEBUG(fprintf(stderr, "ijsgutenprint: start printing page %d\n", page));
       print_messages_as_errors = 1;
       if (!version_is_ok)
 	{
@@ -1340,6 +1501,7 @@ main (int argc, char **argv)
 	  if (page == 0)
 	    stp_start_job(img.v, &si);
 	  stp_print(img.v, &si);
+	  old_v = stp_vars_create_copy(img.v);
 	}
       else
 	{
@@ -1347,25 +1509,40 @@ main (int argc, char **argv)
 	  status = IJS_ERANGE;
 	  break;
 	}
-
-      while (img.bytes_left)
+      if (job_aborted)
 	{
-	  status = image_next_row(&img);
-	  if (status)
+	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: aborting job\n"));
+	  status = 1;
+	}
+      else
+	{
+	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: done printing page %d\n", page));
+
+	  while (img.bytes_left)
 	    {
-	      fprintf(stderr, _("ERROR: ijsgutenprint: Get next row failed at %.0f\n"),
-		      img.bytes_left);
-	      break;
+	      status = image_next_row(&img);
+	      if (status)
+		{
+		  fprintf(stderr, _("ERROR: ijsgutenprint: Get next row failed at %.0f\n"),
+			  img.bytes_left);
+		  break;
+		}
 	    }
-	}
 
-      image_finish(&img);
-      page++;
+	  image_finish(&img);
+	  status = ijs_server_get_page_header(img.ctx, &ph);
+	}
+      if (status > 0)
+	{
+	  fprintf(stderr, "Ending job after page %d\n", page);
+	  stp_end_job(old_v, &si);
+	}
+      else
+	{
+	  stp_vars_destroy(old_v);
+	  page++;
+	}
     }
-  while (status == 0);
-  if (status > 0)
-    stp_end_job(img.v, &si);
-
   if (f)
     {
       fclose(f);
@@ -1376,6 +1553,8 @@ main (int argc, char **argv)
 
   ijs_server_done(img.ctx);
 
+  STP_DEBUG(fprintf (stderr, "ijsgutenprint: printed total %.0f bytes\n",
+		     total_bytes_printed));
   STP_DEBUG(fprintf (stderr, "ijsgutenprint: server exiting with status %d\n", status));
   return status;
 }
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index fa5c842..ff81bf0 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -262,6 +265,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -594,9 +598,6 @@ uninstall-am: uninstall-gimp_plug_inPROGRAMS uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/gimp/print.c b/src/gimp/print.c
index ac3d15e..e5ee0fd 100644
--- a/src/gimp/print.c
+++ b/src/gimp/print.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print.c,v 1.65 2004/09/29 00:41:59 rlk Exp $"
+ * "$Id: print.c,v 1.66 2006/05/04 11:30:08 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -129,6 +129,7 @@ query (void)
 			  (BAD_CONST_CHAR) auth,
 			  (BAD_CONST_CHAR) copy,
 			  (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
+			  /* Do not translate the "<Image>" */
 			  (BAD_CONST_CHAR) N_("<Image>/File/Print..."),
 			  (BAD_CONST_CHAR) types,
 			  GIMP_PLUGIN,
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index d520068..5c4723e 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -262,6 +265,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -594,9 +598,6 @@ uninstall-am: uninstall-gimp2_plug_inPROGRAMS uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/gimp2/print.c b/src/gimp2/print.c
index 8ae4e26..ef61867 100644
--- a/src/gimp2/print.c
+++ b/src/gimp2/print.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print.c,v 1.6 2004/11/01 20:46:34 rleigh Exp $"
+ * "$Id: print.c,v 1.7 2006/05/04 11:10:58 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -133,6 +133,7 @@ query (void)
 			  (BAD_CONST_CHAR) auth,
 			  (BAD_CONST_CHAR) copy,
 			  (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
+			  /* Do not translate the prefix "<Image>" */
 			  (BAD_CONST_CHAR) N_("<Image>/File/Print..."),
 			  (BAD_CONST_CHAR) types,
 			  GIMP_PLUGIN,
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index 55f33a0..94c5726 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -281,6 +284,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -701,9 +705,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 0d5e20e..6c56519 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -283,6 +286,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -724,9 +728,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index 1e20809..466f684 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.9 2005/12/30 20:32:07 rlk Exp $"
+ * "$Id: panel.c,v 1.10 2006/03/18 23:56:37 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -3990,11 +3990,11 @@ fill_buffer_writefunc(void *priv, const char *buffer, size_t bytes)
       for (i = 0; i < pixels; i++)
 	{
 	  if (mask & 1)
-	    where[0] = -xbuffer[0];
+	    where[0] = ~xbuffer[0];
 	  if (mask & 2)
-	    where[1] = -xbuffer[1];
+	    where[1] = ~xbuffer[1];
 	  if (mask & 4)
-	    where[2] = -xbuffer[2];
+	    where[2] = ~xbuffer[2];
 	  where += 3;
 	  xbuffer += 3;
 	}
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index d4191c1..b387ad5 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -353,6 +356,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -886,9 +890,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c
index 5cff81d..063348d 100644
--- a/src/main/bit-ops.c
+++ b/src/main/bit-ops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.c,v 1.8 2005/06/29 01:42:34 rlk Exp $"
+ * "$Id: bit-ops.c,v 1.9 2006/03/28 03:27:57 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1087,7 +1087,7 @@ stp_pack_uncompressed(stp_vars_t *v,
   find_first_and_last(line, length, first, last);
   memcpy(comp_buf, line, length);
   *comp_ptr = comp_buf + length;
-  if (first > last)
+  if (first && last && *first > *last)
     return 0;
   else
     return 1;
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 30636da..6f258ba 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.60 2006/01/06 22:10:41 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.61 2006/01/31 03:09:48 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -2142,9 +2142,9 @@ static const shade_set_t ultrachrome_matte_shades =	/* Ultrachrome with matte bl
 
 static const shade_set_t ultra3_photo_shades =	/* R2400 with photo black ink */
 {
-  { 3, { 1.0, 0.555, 0.185 }},
-  { 2, { 1.0, 0.25 }},
-  { 2, { 1.0, 0.25 }},
+  { 3, { 1.0, 0.48, 0.16 }},
+  { 2, { 1.0, 0.35 }},
+  { 2, { 1.0, 0.20 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
@@ -2155,8 +2155,8 @@ static const shade_set_t ultra3_photo_shades =	/* R2400 with photo black ink */
 static const shade_set_t ultra3_matte_shades =	/* R2400 with matte black ink */
 {
   { 3, { 1.0, 0.278, 0.093 }},
-  { 2, { 1.0, 0.25 }},
-  { 2, { 1.0, 0.25 }},
+  { 2, { 1.0, 0.35 }},
+  { 2, { 1.0, 0.20 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index a680048..845a7a1 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.27 2006/01/06 22:10:41 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.28 2006/04/30 21:29:52 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -244,9 +244,16 @@ escp2_set_remote_sequence(stp_vars_t *v)
 	      /* These commands do not appear to do anything on the */
 	      /* 2200.  Need to test on R800. */
 	      /* From the R1800 manual -- bottom margin borderless */
-	      stp_send_command(v, "US", "bcc", 0, 2);
+	      stp_send_command(v, "PM", "bcc", 0, 0);
+	      stp_send_command(v, "DP", "bcc", 0, 0);
+	      stp_send_command(v, "SN", "bc", 0);
+	      stp_send_command(v, "MI", "bccc", 1, 0xb, 1);
+	      stp_send_command(v, "US", "bccc", 0, 0, 2);
+	      stp_send_command(v, "US", "bccc", 0, 1, 0);
 	      /* This command means "check paper size - no" */
-	      stp_send_command(v, "US", "bcc", 2, 0);
+	      stp_send_command(v, "US", "bccc", 0, 2, 0);
+	      stp_send_command(v, "DR", "bcccc", 0, 0, 0, 0);
+	      stp_send_command(v, "PP", "bccc", 0, 1, 0xff);
 #endif
 	    }
 	}
@@ -471,7 +478,6 @@ set_horizontal_position(stp_vars_t *v, stp_pass_t *pass, int vertical_subpass)
 
   if (pos != 0)
     {
-      /* Note hard-coded 1440 -- from Epson manuals */
       if (pd->command_set == MODEL_COMMAND_PRO || pd->variable_dots)
 	stp_send_command(v, "\033($", "bl", pos);
       else if (pd->advanced_command_set || pd->res->hres > 720)
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 9796ac7..6a71ac1 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.91 2006/01/08 02:33:16 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.97 2006/04/13 12:10:04 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -369,12 +369,12 @@ static const char ultra_k3_matte_lum_adj[] =
 "<gutenprint>\n"
 "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
 "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.51 0.55 0.61 0.67 0.71 0.76 0.79 "  /* B */
+/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
 /* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
 /* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
 /* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
 /* Y */  "1.00 0.98 0.97 0.95 0.93 0.91 0.88 0.83 "  /* G */
-/* G */  "0.75 0.64 0.58 0.54 0.52 0.51 0.50 0.49 "  /* C */
+/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
 "</sequence>\n"
 "</curve>\n"
 "</gutenprint>\n";
@@ -414,12 +414,12 @@ static const char ultra_k3_glossy_lum_adj[] =
 "<gutenprint>\n"
 "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
 "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.53 0.60 0.64 0.67 0.69 0.72 0.75 "  /* B */
+/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
 /* B */  "0.75 0.71 0.70 0.70 0.72 0.76 0.81 0.87 "  /* M */
 /* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
 /* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
 /* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
-/* G */  "0.83 0.69 0.61 0.55 0.53 0.52 0.50 0.49 "  /* C */
+/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
 "</sequence>\n"
 "</curve>\n"
 "</gutenprint>\n";
@@ -479,8 +479,8 @@ static const char r800_matte_hue_adj[] =
 /* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.02 0.02 "  /* M */
 /* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
 /* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
+/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
+/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
 "</sequence>\n"
 "</curve>\n"
 "</gutenprint>\n";
@@ -525,8 +525,8 @@ static const char r800_glossy_hue_adj[] =
 /* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.00 0.00 "  /* M */
 /* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
 /* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
+/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
+/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
 "</sequence>\n"
 "</curve>\n"
 "</gutenprint>\n";
@@ -681,25 +681,25 @@ DECLARE_PAPER_ADJUSTMENTS(photo2);
 
 static const paper_adjustment_t photo3_adjustments[] =
 {
-  { "Plain",        0.615, .35, 0.75, .15, .9, 1, .7, .8, .9, 1, 1.0,
+  { "Plain",        0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "PlainFast",    0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+  { "PlainFast",    0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Postcard",     0.692, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
+  { "Postcard",     0.692, .35, 0.5, .2, .9, 1, .85, .85, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyFilm",   0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "GlossyFilm",   0.833, .5, 0.75, .2, .999, 1, .7, .8, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
   { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Envelope",     0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+  { "Envelope",     0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
   { "BackFilm",     0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Matte",        0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
+  { "Matte",        0.833, .35, 0.5, .25, .999, 1, .67, .72, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "MatteHeavy",   0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
+  { "MatteHeavy",   0.833, .35, 0.5, .25, .999, 1, .85, .85, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Inkjet",       0.709, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+  { "Inkjet",       0.709, .5, 0.75, .2, .9, 1, .85, .85, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
   { "Coated",       0.833, .45, 0.5, .25, .999, 1, .76, .84, .66, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
@@ -717,7 +717,7 @@ static const paper_adjustment_t photo3_adjustments[] =
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj  },
   { "ColorLife",    0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Other",        0.615, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
+  { "Other",        0.615, .35, 0.5, .5, .9, 1, .85, .85, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
 };
 
@@ -845,7 +845,7 @@ static const paper_adjustment_t ultrachrome_matte_adjustments[] =
     ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
   { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
     ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, .5, .92,
+  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, 1, .92,
     ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
   { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
     ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
@@ -863,47 +863,47 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
 
 static const paper_adjustment_t ultrachrome_k3_photo_adjustments[] =
 {
-  { "Plain", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Plain", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Postcard", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Envelope", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Coated", 0.83, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Photo", 1.0, .5, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+  { "GlossyPhoto", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+  { "Luster", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+  { "Other", 0.72, .1, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
 };
 
@@ -911,45 +911,45 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
 
 static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
 {
-  { "Plain", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, 1, 1, .6, 1, 1.0,
+  { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .4, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .3, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+  { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+  { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, .5, .92,
+  { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
     ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, .4, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+  { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
     ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
 };
 
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index a60dad1..9dfe8e7 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.31 2006/01/07 02:43:28 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.33 2006/05/06 21:30:59 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -138,6 +138,15 @@ static const res_t r_1440x1440sw =
 static const res_t r_1440x1440ov =
 { "1440x1440ov",   N_("1440 x 1440 DPI"),
   2880, 1440,  1440, 1440, 1, 0, 1};
+static const res_t r_1440x1440sw3650 =
+{ "1440x1440ov",   N_("1440 x 1440"),
+  1440, 1440,  1440, 1440, 1, 0, 1};
+static const res_t r_1440x1440sw3650hq =
+{ "2880x1440sw",   N_("1440 x 1440 DPI High Quality"),
+  1440, 1440,  1440, 1440, 1, 0, 2};
+static const res_t r_1440x1440sw3650hq2 =
+{ "5760x1440sw",   N_("1440 x 1440 DPI Highest Quality"),
+  1440, 1440,  1440, 1440, 1, 0, 4};
 
 static const res_t r_2880x1440mw =
 { "2880x1440mw",   N_("2880 x 1440 DPI"),
@@ -148,6 +157,15 @@ static const res_t r_2880x1440sw =
 static const res_t r_1440x2880sw =
 { "1440x2880sw",   N_("2880 x 1440 DPI Transposed"),
   1440, 2880,  1440, 2880, 1, 0, 1};
+static const res_t r_2880x1440sw2400 =
+{ "2880x1440sw",   N_("2880 x 1440 DPI"),
+  1440, 2880,  1440, 2880, 1, 0, 1};
+static const res_t r_2880x1440sw2400hq =
+{ "2880x2880sw",   N_("2880 x 1440 DPI High Quality"),
+  1440, 2880,  1440, 2880, 1, 0, 2};
+static const res_t r_2880x1440sw2400hq2 =
+{ "5760x2880sw",   N_("2880 x 1440 DPI Highest Quality"),
+  1440, 2880,  1440, 2880, 1, 0, 4};
 
 static const res_t r_5760x1440sw =
 { "5760x1440sw",   N_("5760 x 1440 DPI"),
@@ -331,6 +349,56 @@ const res_t *const stpi_escp2_superfine_reslist[] =
   NULL
 };
 
+const res_t *const stpi_escp2_r2400_reslist[] =
+{
+  &r_360x120sw,
+
+  &r_360x180sw,
+
+  &r_360x240sw,
+
+  &r_360sw,
+
+  &r_720x360sw,
+
+  &r_720sw,
+
+  &r_1440x720sw,
+  &r_720x1440sw,
+
+  &r_1440x1440sw,
+
+  &r_2880x1440sw2400,
+  &r_2880x1440sw2400hq,
+  &r_2880x1440sw2400hq2,
+
+  NULL
+};
+
+const res_t *const stpi_escp2_cx3650_reslist[] =
+{
+  &r_360x120sw,
+
+  &r_360x180sw,
+
+  &r_360x240sw,
+
+  &r_360sw,
+
+  &r_720x360sw,
+
+  &r_720sw,
+
+  &r_1440x720sw,
+  &r_720x1440sw,
+
+  &r_1440x1440sw3650,
+  &r_1440x1440sw3650hq,
+  &r_1440x1440sw3650hq2,
+
+  NULL
+};
+
 const res_t *const stpi_escp2_picturemate_reslist[] =
 {
 
diff --git a/src/main/papers.xml b/src/main/papers.xml
index 44db989..4f2bacd 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.19 2005/12/31 17:22:32 rlk Exp $"
+   "$Id: papers.xml,v 1.21 2006/04/20 00:33:41 rlk Exp $"
 -->
 
 <!--
@@ -81,7 +81,7 @@
       <unit value="english"/>
     </paper>
     <paper name="w324h495">
-      <description value="Epson 4x6 Photo Paper"/>
+      <description value="Epson 4x6 Photo Paper (tear-off borders)"/>
       <width value="324"/>
       <height value="495"/>
       <unit value="english-extended"/>
@@ -954,6 +954,27 @@
       <height value="566"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="w612h935">
+      <description value="Chilean Office"/>
+      <comment value="215.9mm x 330mm"/>
+      <width value="612"/>
+      <height value="935"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="w1224h1584">
+      <description value="Chilean Double Letter"/>
+      <comment value="431.8mm x 558.8mm"/>
+      <width value="1224"/>
+      <height value="1584"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="w1224h1871">
+      <description value="Chilean Double Office"/>
+      <comment value="215.9mm x 660mm"/>
+      <width value="1224"/>
+      <height value="1871"/>
+      <unit value="english-extended"/>
+    </paper>
 <!--
     Custom
 -->
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 53b56b0..090e9f1 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.167 2005/10/21 13:31:41 faust3 Exp $"
+ * "$Id: print-canon.c,v 1.173 2006/05/12 22:43:23 rlk Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -636,6 +636,16 @@ static const canon_variable_inklist_t canon_ink_standardphoto[] =
     &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
     &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
   },
+  {
+    1,7,
+    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
+    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
+  },
+  {
+    2,7,
+    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
+    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
+  },
 };
 
 /* Ink set for printers using CMYK and CcMmYK printing, 1 or 3bit/pixel */
@@ -656,6 +666,11 @@ static const canon_variable_inklist_t canon_ink_superphoto[] =
     &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
     &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
   },
+  {
+    3,7,
+    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
+    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
+  },
 };
 
 
@@ -963,7 +978,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,-1,1,0,-1,-1},/*090x090 180x180 360x360 720x360 720x720 1440x1440*/
     {1,1,1,1,1,1},    /*------- ------- 360x360 720x360 ------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -982,7 +997,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1001,7 +1016,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,-1,0,0,-1,-1},/*090x090 180x180 360x360 720x360 720x720 1440x1440*/
     {1,1,1,1,1,1},    /*------- ------- 360x360 720x360 ------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1194,7 +1209,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1212,7 +1227,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1230,7 +1245,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,0,0,0,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
     {1,3.5,1.8,1,1,1},/*------- 300x300 600x600 1200x600 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1248,7 +1263,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,0,0,0,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
     {1,1,1,1,1,1},    /*------- 300x300 600x600 1200x600 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1274,7 +1289,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1292,7 +1307,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {0,0,-1,-1,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1310,7 +1325,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
     {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1328,7 +1343,7 @@ static const canon_cap_t canon_model_capabilities[] =
 #ifndef EXPERIMENTAL_STUFF
     {-1,0,0,-1,0,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
     {1,1,1,1,1,1},    /*------- 300x300 600x600 -------- 1200x1200 ---------*/
-    CANON_INK(canon_ink_standard),
+    CANON_INK(canon_ink_standardphoto),
 #endif
     standard_lum_adjustment,
     standard_hue_adjustment,
@@ -1344,7 +1359,7 @@ static const canon_cap_t canon_model_capabilities[] =
     CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte|CANON_CAP_DUPLEX,  /*features */
     CANON_MODES(canon_nomodes),
 #ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,-1,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
+    {-1,-1,0,-1,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
     {1,1,1,1,1,1},    /*------- 300x300 600x600 1200x600 --------- ---------*/
     CANON_INK(canon_ink_standard_pixma),
 #endif
@@ -1675,14 +1690,16 @@ canon_printhead_colors(const char *name, const canon_cap_t * caps)
       if (!strcmp(name,"PhotoCMYK")) return COLOR_CCMMYYK;
     }
 
-  if (name && *name == 0) {
-    if (caps->inks & CANON_INK_CMYK) return COLOR_CMYK;
-    if (caps->inks & CANON_INK_CMY)  return COLOR_CMY;
-    if (caps->inks & CANON_INK_K)    return COLOR_MONOCHROME;
-  }
-
-  stp_deprintf(STP_DBG_CANON,"canon: Unknown head combo '%s' - reverting to black\n",name);
-  return COLOR_MONOCHROME;
+  if (caps->inks & CANON_INK_CcMmYyK)
+    return COLOR_CCMMYYK;
+  else if (caps->inks & CANON_INK_CcMmYK)
+    return COLOR_CCMMYK;
+  else if (caps->inks & CANON_INK_CMYK)
+    return COLOR_CMYK;
+  else if (caps->inks & CANON_INK_CMY)
+    return COLOR_CMY;
+  else
+    return COLOR_MONOCHROME;
 }
 
 static unsigned char
@@ -1889,6 +1906,8 @@ canon_describe_output(const stp_vars_t *v)
     case COLOR_CMY:
       return "CMY";
     case COLOR_CMYK:
+    case COLOR_CCMMYK:
+    case COLOR_CCMMYYK:
       return "CMYK";
     case COLOR_MONOCHROME:
     default:
@@ -1938,11 +1957,24 @@ canon_parameters(const stp_vars_t *v, const char *name,
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
+	const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
+	const char *ink_type = stp_get_string_parameter(v, "InkType");
+	colormode_t colormode = canon_printhead_colors(ink_type,caps);
+	int printhead= canon_printhead_type(ink_type,caps);
+
+	if ((print_mode && strcmp(print_mode, "BW") == 0) ||
+	    printhead == 0 || caps->inks == CANON_INK_K)
+	  colormode = COLOR_MONOCHROME;
+
 	stp_fill_parameter_settings(description,
-				     &(float_parameters[i].param));
+				    &(float_parameters[i].param));
 	description->deflt.dbl = float_parameters[i].defval;
 	description->bounds.dbl.upper = float_parameters[i].max;
 	description->bounds.dbl.lower = float_parameters[i].min;
+	if (colormode != COLOR_MONOCHROME || !float_parameters[i].color_only)
+	  description->is_active = 1;
+	else
+	  description->is_active = 0;
 	return;
       }
 
@@ -2012,21 +2044,21 @@ canon_parameters(const stp_vars_t *v, const char *name,
   {
     description->bounds.str= stp_string_list_create();
     /* used internally: do not translate */
-    if ((caps->inks & CANON_INK_K))
+    if ((caps->inks & CANON_INK_CcMmYyK))
       stp_string_list_add_string(description->bounds.str,
-			       "Gray", _("Black"));
-    if ((caps->inks & CANON_INK_CMY))
+			       "PhotoCMYK", _("Photo CcMmYK Color"));
+    if ((caps->inks & CANON_INK_CcMmYK))
       stp_string_list_add_string(description->bounds.str,
-			       "RGB", _("CMY Color"));
+			       "PhotoCMY", _("Photo CcMmY Color"));
     if ((caps->inks & CANON_INK_CMYK))
       stp_string_list_add_string(description->bounds.str,
 			       "CMYK", _("CMYK Color"));
-    if ((caps->inks & CANON_INK_CcMmYK))
+    if ((caps->inks & CANON_INK_CMY))
       stp_string_list_add_string(description->bounds.str,
-			       "PhotoCMY", _("Photo CcMmY Color"));
-    if ((caps->inks & CANON_INK_CcMmYyK))
+			       "RGB", _("CMY Color"));
+    if ((caps->inks & CANON_INK_K))
       stp_string_list_add_string(description->bounds.str,
-			       "PhotoCMYK", _("Photo CcMmYK Color"));
+			       "Gray", _("Black"));
     description->deflt.str =
       stp_string_list_param(description->bounds.str, 0)->name;
   }
@@ -2069,8 +2101,9 @@ canon_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "PrintingMode") == 0)
   {
     description->bounds.str = stp_string_list_create();
-    stp_string_list_add_string
-      (description->bounds.str, "Color", _("Color"));
+    if (caps->inks != CANON_INK_K)
+      stp_string_list_add_string
+	(description->bounds.str, "Color", _("Color"));
     stp_string_list_add_string
       (description->bounds.str, "BW", _("Black and White"));
     description->deflt.str =
@@ -3418,6 +3451,7 @@ static const stp_printfuncs_t print_canon_printfuncs =
   canon_parameters,
   stp_default_media_size,
   canon_imageable_area,
+  canon_imageable_area,
   canon_limit,
   canon_print,
   canon_describe_resolution,
diff --git a/src/main/print-dither-matrices.c b/src/main/print-dither-matrices.c
index b7fa06a..0d30cbb 100644
--- a/src/main/print-dither-matrices.c
+++ b/src/main/print-dither-matrices.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-dither-matrices.c,v 1.35 2005/10/23 19:43:14 rlk Exp $"
+ * "$Id: print-dither-matrices.c,v 1.36 2006/03/19 00:19:09 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -597,7 +597,7 @@ xml_doc_get_dither_array(stp_mxml_node_t *doc)
 
   if (doc == NULL )
     {
-      fprintf(stderr,"xml_doc_get_dither_array: XML file not parsed successfully.\n");
+      stp_erprintf("xml_doc_get_dither_array: XML file not parsed successfully.\n");
       return NULL;
     }
 
@@ -605,14 +605,14 @@ xml_doc_get_dither_array(stp_mxml_node_t *doc)
 
   if (cur == NULL)
     {
-      fprintf(stderr,"xml_doc_get_dither_array: empty document\n");
+      stp_erprintf("xml_doc_get_dither_array: empty document\n");
       return NULL;
     }
 
   xmlseq = stp_xml_get_node(cur, "gutenprint", "dither-matrix", NULL);
   if (xmlseq == NULL )
     {
-      fprintf(stderr,"xml-doc-get-dither-array: XML file is not a dither matrix.\n");
+      stp_erprintf("xml-doc-get-dither-array: XML file is not a dither matrix.\n");
       return NULL;
     }
 
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 93b9994..e5c33d7 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.190 2006/01/10 03:15:30 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.199 2006/05/06 21:30:59 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -295,6 +295,14 @@ static const escp2_densities_t picturemate_densities =
 {   0,   0,     0,     0, 1.596, 0.798, 0.650, 0.530, 0.0   };
 
 
+#define DECLARE_INPUT_SLOT(name)				\
+static const input_slot_list_t name##_input_slot_list =		\
+{								\
+  #name,							\
+  name##_input_slots,						\
+  sizeof(name##_input_slots) / sizeof(const input_slot_t),	\
+}
+
 static const input_slot_t standard_roll_feed_input_slots[] =
 {
   {
@@ -317,11 +325,7 @@ static const input_slot_t standard_roll_feed_input_slots[] =
   }
 };
 
-static const input_slot_list_t standard_roll_feed_input_slot_list =
-{
-  standard_roll_feed_input_slots,
-  sizeof(standard_roll_feed_input_slots) / sizeof(const input_slot_t)
-};
+DECLARE_INPUT_SLOT(standard_roll_feed);
 
 static const input_slot_t cutter_roll_feed_input_slots[] =
 {
@@ -354,11 +358,7 @@ static const input_slot_t cutter_roll_feed_input_slots[] =
   }
 };
 
-static const input_slot_list_t cutter_roll_feed_input_slot_list =
-{
-  cutter_roll_feed_input_slots,
-  sizeof(cutter_roll_feed_input_slots) / sizeof(const input_slot_t)
-};
+DECLARE_INPUT_SLOT(cutter_roll_feed);
 
 static const input_slot_t cd_cutter_roll_feed_input_slots[] =
 {
@@ -409,11 +409,7 @@ static const input_slot_t cd_cutter_roll_feed_input_slots[] =
   }
 };
 
-static const input_slot_list_t cd_cutter_roll_feed_input_slot_list =
-{
-  cd_cutter_roll_feed_input_slots,
-  sizeof(cd_cutter_roll_feed_input_slots) / sizeof(const input_slot_t)
-};
+DECLARE_INPUT_SLOT(cd_cutter_roll_feed);
 
 static const input_slot_t cd_roll_feed_input_slots[] =
 {
@@ -455,12 +451,143 @@ static const input_slot_t cd_roll_feed_input_slots[] =
   }
 };
 
-static const input_slot_list_t cd_roll_feed_input_slot_list =
+DECLARE_INPUT_SLOT(cd_roll_feed);
+
+static const input_slot_t r2400_input_slots[] =
 {
-  cd_roll_feed_input_slots,
-  sizeof(cd_roll_feed_input_slots) / sizeof(const input_slot_t)
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Velvet",
+    N_("Manual Sheet Guide"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Matte",
+    N_("Manual Feed (Front)"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(r2400);
+
+static const input_slot_t r1800_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Velvet",
+    N_("Manual Sheet Guide"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Matte",
+    N_("Manual Feed (Front)"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
+    { 6, "IR\002\000\000\002" }
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+};
+
+DECLARE_INPUT_SLOT(r1800);
+
+static const input_slot_t rx700_input_slots[] =
+{
+  {
+    "Rear",
+    N_("Rear Tray"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Front",
+    N_("Front Tray"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "PhotoBoard",
+    N_("Photo Board"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
 };
 
+DECLARE_INPUT_SLOT(rx700);
+
 static const input_slot_t pro_roll_feed_input_slots[] =
 {
   {
@@ -483,11 +610,7 @@ static const input_slot_t pro_roll_feed_input_slots[] =
   }
 };
 
-static const input_slot_list_t pro_roll_feed_input_slot_list =
-{
-  pro_roll_feed_input_slots,
-  sizeof(pro_roll_feed_input_slots) / sizeof(const input_slot_t)
-};
+DECLARE_INPUT_SLOT(pro_roll_feed);
 
 static const input_slot_t spro5000_input_slots[] =
 {
@@ -529,14 +652,11 @@ static const input_slot_t spro5000_input_slots[] =
   }
 };
 
-static const input_slot_list_t spro5000_input_slot_list =
-{
-  spro5000_input_slots,
-  sizeof(spro5000_input_slots) / sizeof(const input_slot_t)
-};
+DECLARE_INPUT_SLOT(spro5000);
 
 static const input_slot_list_t default_input_slot_list =
 {
+  "Standard",
   NULL,
   0,
 };
@@ -583,9 +703,9 @@ static const quality_t p1_5_qualities[] =
   { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
   { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
   { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
-  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
+  { "Photo",       N_("Photo"),        1440, 720, 1440, 720, 1440, 720 },
+  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 1440, 1440, 1440, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  1440, 2880, 1440, 2880, 1440, 2880 },
   { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
 };
 
@@ -755,7 +875,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     15, 1, 4, 15, 1, 4, 15, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -772,7 +892,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -789,7 +909,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -806,7 +926,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -823,7 +943,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -840,7 +960,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -857,7 +977,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -876,10 +996,10 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
-    1, 7, 0, 0,
+    1, 15, 0, 0,		/* Is it really 15 pairs??? */
     sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
     stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup,
     standard_bits, g3_base_res, &default_input_slot_list,
@@ -893,7 +1013,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(118 / 10), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -910,7 +1030,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -929,7 +1049,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 15, 0, 0,
@@ -946,7 +1066,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 15, 0, 0,
@@ -963,7 +1083,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -980,7 +1100,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -997,7 +1117,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1014,7 +1134,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1031,7 +1151,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1048,7 +1168,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1065,7 +1185,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0,
     1, 15, 0, 0,
@@ -1082,7 +1202,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1099,7 +1219,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1116,7 +1236,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     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,
     3, 15, 0, 0,
@@ -1133,7 +1253,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1,
     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,
     3, 15, 0, 0,
@@ -1150,7 +1270,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1167,7 +1287,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1184,7 +1304,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     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,
     3, 15, 0, 0,
@@ -1201,7 +1321,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     2, 15, 0, 0,
@@ -1218,7 +1338,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1235,7 +1355,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1252,7 +1372,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1269,7 +1389,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1286,7 +1406,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1303,7 +1423,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1320,7 +1440,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1337,7 +1457,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1354,7 +1474,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1371,7 +1491,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1388,7 +1508,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1405,7 +1525,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1422,7 +1542,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1439,7 +1559,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1456,7 +1576,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1473,7 +1593,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1490,7 +1610,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1507,7 +1627,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1524,7 +1644,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1541,7 +1661,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
     4, 15, 0, 0,
@@ -1558,7 +1678,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
     4, 15, 0, 0,
@@ -1575,7 +1695,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1592,7 +1712,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1609,7 +1729,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1626,7 +1746,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1643,7 +1763,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1660,7 +1780,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
     4, 15, 0, 0,
@@ -1677,7 +1797,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1694,7 +1814,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1711,7 +1831,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1727,8 +1847,8 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
-    180, 180, 2, 360, 360, 1, 360, 360, 1, 6,
-    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0,
+    180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
+    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1745,7 +1865,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
-    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1762,7 +1882,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1779,7 +1899,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1796,7 +1916,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1813,7 +1933,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842,
     3, 15, 0, 0,
@@ -1830,7 +1950,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
@@ -1847,12 +1967,12 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_cmykrb_inkgroup,
+    stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
     variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
     &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r800_channel_name_list
@@ -1863,13 +1983,13 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0,
+    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
+    360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
     p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_cx3650_inkgroup,
+    stpi_escp2_cx3650_reslist, &stpi_escp2_cx3650_inkgroup,
     variable_bits, variable_base_res, &default_input_slot_list,
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &mfp2005_channel_name_list
@@ -1881,7 +2001,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1898,13 +2018,13 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_cmykrb_inkgroup,
-    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+    stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
+    variable_bits, c1_5_base_res, &r1800_input_slot_list,
     &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r800_channel_name_list
   },
@@ -1915,12 +2035,12 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
+    stpi_escp2_r2400_reslist, &stpi_escp2_photo_gen3_inkgroup,
     variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r800_channel_name_list
@@ -1932,7 +2052,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0,
+    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -1949,13 +2069,13 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
-    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842,
     4, 15, 0, 0,
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
     stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
-    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+    variable_bits, c1_5_base_res, &rx700_input_slot_list,
     &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &rx700_channel_name_list
   },
@@ -1966,13 +2086,13 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
     p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
-    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+    stpi_escp2_r2400_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
+    variable_bits, c1_5_base_res, &r2400_input_slot_list,
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r2400_channel_name_list
   },
@@ -1983,7 +2103,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     4, 15, 0, 0,
@@ -2000,7 +2120,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0,
+    360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1,
     INCH(4), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
@@ -2010,6 +2130,74 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     &picturemate_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &picturemate_channel_name_list
   },
+  /* 74: PM-A650 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
+    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+    4, 15, 0, 0,
+    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
+    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &standard_channel_name_list
+  },
+  /* 75: Japanese PM-A750 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
+    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+    4, 15, 0, 0,
+    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
+    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &standard_channel_name_list
+  },
+  /* 76: Japanese PM-A890 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
+    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+    4, 15, 0, 0,
+    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
+    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &standard_channel_name_list
+  },
+  /* 77: Japanese PM-D600 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+    4, 15, 0, 0,
+    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
+    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &photo_channel_name_list
+  },
 };
 
 const int stpi_escp2_model_limit =
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 0711874..42b7c62 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.347 2006/01/09 12:20:44 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.350 2006/04/30 21:29:53 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -385,6 +385,7 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(max_black_resolution),
   PARAMETER_INT(zero_margin_offset),
   PARAMETER_INT(extra_720dpi_separation),
+  PARAMETER_INT(horizontal_position_alignment),
   PARAMETER_INT(physical_channels),
   PARAMETER_INT(left_margin),
   PARAMETER_INT(right_margin),
@@ -665,6 +666,7 @@ DEF_SIMPLE_ACCESSOR(black_initial_vertical_offset, int)
 DEF_SIMPLE_ACCESSOR(max_black_resolution, int)
 DEF_SIMPLE_ACCESSOR(zero_margin_offset, int)
 DEF_SIMPLE_ACCESSOR(extra_720dpi_separation, int)
+DEF_SIMPLE_ACCESSOR(horizontal_position_alignment, unsigned)
 DEF_SIMPLE_ACCESSOR(physical_channels, int)
 DEF_SIMPLE_ACCESSOR(alignment_passes, int)
 DEF_SIMPLE_ACCESSOR(alignment_choices, int)
@@ -1872,6 +1874,7 @@ imax(int a, int b)
 
 static void
 internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
+			int use_maximum_area,
 			int *left, int *right, int *bottom, int *top)
 {
   int	width, height;			/* Size of page */
@@ -1885,7 +1888,7 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
   const stp_papersize_t *pt = NULL;
   const input_slot_t *input_slot = NULL;
 
-  if (media_size && use_paper_margins)
+  if (media_size)
     pt = stp_get_papersize_by_name(media_size);
 
   input_slot = get_input_slot(v);
@@ -1898,14 +1901,24 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
   stp_default_media_size(v, &width, &height);
   if (cd)
     {
-      left_margin = 0;
-      right_margin = 0;
-      bottom_margin = 0;
-      top_margin = 0;
+      if (pt)
+	{
+	  left_margin = pt->left;
+	  right_margin = pt->right;
+	  bottom_margin = pt->bottom;
+	  top_margin = pt->top;
+	}
+      else
+	{
+	  left_margin = 0;
+	  right_margin = 0;
+	  bottom_margin = 0;
+	  top_margin = 0;
+	}
     }
   else
     {
-      if (pt)
+      if (pt && use_paper_margins)
 	{
 	  left_margin = pt->left;
 	  right_margin = pt->right;
@@ -1922,14 +1935,21 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
   *right =	width - right_margin;
   *top =	top_margin;
   *bottom =	height - bottom_margin;
-  if (!cd &&
-      escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) &&
-      stp_get_boolean_parameter(v, "FullBleed"))
+  if (escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) &&
+      (use_maximum_area ||
+       (!cd && stp_get_boolean_parameter(v, "FullBleed"))))
     {
-      *left -= 80 / (360 / 72);	/* 80 per the Epson manual */
-      *right += 80 / (360 / 72);	/* 80 per the Epson manual */
-      *bottom += escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 /
-	escp2_base_separation(v);
+      if (pt)
+	{
+	  if (pt->left <= 0 && pt->right <= 0 && pt->top <= 0 &&
+	      pt->bottom <= 0)
+	    {
+	      *left -= 80 / (360 / 72);		/* 80 per the Epson manual */
+	      *right += 80 / (360 / 72);	/* 80 per the Epson manual */
+	      *bottom += escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 /
+		escp2_base_separation(v);
+	    }
+	}
     }
 }
 
@@ -1944,7 +1964,17 @@ escp2_imageable_area(const stp_vars_t *v,   /* I */
 		     int  *bottom,	/* O - Bottom position in points */
 		     int  *top)		/* O - Top position in points */
 {
-  internal_imageable_area(v, 1, left, right, bottom, top);
+  internal_imageable_area(v, 1, 0, left, right, bottom, top);
+}
+
+static void
+escp2_maximum_imageable_area(const stp_vars_t *v,   /* I */
+			     int  *left,   /* O - Left position in points */
+			     int  *right,  /* O - Right position in points */
+			     int  *bottom, /* O - Bottom position in points */
+			     int  *top)    /* O - Top position in points */
+{
+  internal_imageable_area(v, 1, 1, left, right, bottom, top);
 }
 
 static void
@@ -2281,12 +2311,15 @@ setup_inks(stp_vars_t *v)
 	    {
 	      stp_erprintf("Not enough shades!\n");
 	    }
-	  if (strcmp(param, "BlackDensity") == 0)
-	    stp_channel_set_black_channel(v, i);
-	  else if (strcmp(param, "GlossDensity") == 0)
+	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
-	      gloss_scale *= get_double_param(v, param);
-	      gloss_channel = i;
+	      if (strcmp(param, "BlackDensity") == 0)
+		stp_channel_set_black_channel(v, i);
+	      else if (strcmp(param, "GlossDensity") == 0)
+		{
+		  gloss_scale *= get_double_param(v, param);
+		  gloss_channel = i;
+		}
 	    }
 	  stp_dither_set_inks(v, i, 1.0, ink_darknesses[i % 8],
 			      channel->n_subchannels, shades->shades,
@@ -2302,37 +2335,40 @@ setup_inks(stp_vars_t *v)
 		stp_channel_set_cutoff_adjustment(v, i, j,
 						  paper->subchannel_cutoff);
 	    }
-	  if (channel->hue_curve && channel->hue_curve->curve_name)
+	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
-	      char *hue_curve_name;
-	      const stp_curve_t *curve = NULL;
-	      stp_asprintf(&hue_curve_name, "%sHueCurve",
-			   channel->hue_curve->curve_name);
-	      curve = stp_get_curve_parameter(v, hue_curve_name);
-	      if (curve)
+	      if (channel->hue_curve && channel->hue_curve->curve_name)
 		{
-		  stp_channel_set_curve(v, i, curve);
-		  hue_curve_found = 1;
+		  char *hue_curve_name;
+		  const stp_curve_t *curve = NULL;
+		  stp_asprintf(&hue_curve_name, "%sHueCurve",
+			       channel->hue_curve->curve_name);
+		  curve = stp_get_curve_parameter(v, hue_curve_name);
+		  if (curve)
+		    {
+		      stp_channel_set_curve(v, i, curve);
+		      hue_curve_found = 1;
+		    }
+		  stp_free(hue_curve_name);
 		}
-	      stp_free(hue_curve_name);
-	    }
-	  if (channel->hue_curve && !hue_curve_found)
-	    {
-	      if (!channel->hue_curve->curve_impl)
-		channel->hue_curve->curve_impl =
-		  stp_curve_create_from_string(channel->hue_curve->curve);
-	      if (channel->hue_curve->curve_impl)
+	      if (channel->hue_curve && !hue_curve_found)
 		{
-		  stp_curve_t *curve_tmp =
-		    stp_curve_create_copy(channel->hue_curve->curve_impl);
+		  if (!channel->hue_curve->curve_impl)
+		    channel->hue_curve->curve_impl =
+		      stp_curve_create_from_string(channel->hue_curve->curve);
+		  if (channel->hue_curve->curve_impl)
+		    {
+		      stp_curve_t *curve_tmp =
+			stp_curve_create_copy(channel->hue_curve->curve_impl);
 #if 0
-		  (void) stp_curve_rescale(curve_tmp,
-					   sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
-					   STP_CURVE_COMPOSE_EXPONENTIATE,
-					   STP_CURVE_BOUNDS_RESCALE);
+		      (void) stp_curve_rescale(curve_tmp,
+					       sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
+					       STP_CURVE_COMPOSE_EXPONENTIATE,
+					       STP_CURVE_BOUNDS_RESCALE);
 #endif
-		  stp_channel_set_curve(v, i, curve_tmp);
-		  stp_curve_destroy(curve_tmp);
+		      stp_channel_set_curve(v, i, curve_tmp);
+		      stp_curve_destroy(curve_tmp);
+		    }
 		}
 	    }
 	}
@@ -2581,7 +2617,7 @@ setup_resolution(stp_vars_t *v)
 
   if (escp2_use_extended_commands(v, pd->res->softweave))
     {
-      pd->unit_scale = escp2_max_hres(v);
+      pd->unit_scale = MAX(escp2_max_hres(v), escp2_max_vres(v));
       pd->horizontal_units = horizontal;
       pd->micro_units = horizontal;
     }
@@ -2594,6 +2630,7 @@ setup_resolution(stp_vars_t *v)
 	pd->micro_units = horizontal;
       pd->horizontal_units = vertical;
     }
+  /* Note hard-coded 1440 -- from Epson manuals */
   if (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) &&
       escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_NO))
     pd->micro_units = 1440;
@@ -2739,8 +2776,11 @@ setup_page(stp_vars_t *v)
 				   safe and print 16 mm */
 
   stp_default_media_size(v, &n, &(pd->page_true_height));
-  internal_imageable_area(v, 0, &pd->page_left, &pd->page_right,
+  internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right,
 			  &pd->page_bottom, &pd->page_top);
+  /* Don't use full bleed mode if the paper itself has a margin */
+  if (pd->page_left > 0 || pd->page_top > 0)
+    stp_set_boolean_parameter(v, "FullBleed", 0);
 
   if (input_slot && input_slot->is_cd && escp2_cd_x_offset(v) > 0)
     {
@@ -2748,6 +2788,13 @@ setup_page(stp_vars_t *v)
 	stp_get_dimension_parameter(v, "CDXAdjustment");
       int top_center = escp2_cd_y_offset(v) +
 	stp_get_dimension_parameter(v, "CDYAdjustment");
+      pd->page_true_height = pd->page_bottom - pd->page_top;
+      stp_set_left(v, stp_get_left(v) - pd->page_left);
+      stp_set_top(v, stp_get_top(v) - pd->page_top);
+      pd->page_right -= pd->page_left;
+      pd->page_bottom -= pd->page_top;
+      pd->page_top = 0;
+      pd->page_left = 0;
       extra_top = top_center - (pd->page_bottom / 2);
       extra_left = left_center - (pd->page_right / 2);
       pd->cd_inner_radius = hub_size * pd->micro_units * 10 / 254 / 2;
@@ -2771,6 +2818,14 @@ setup_page(stp_vars_t *v)
   pd->image_scaled_width = pd->image_width * pd->res->hres / 72;
   pd->image_printed_width = pd->image_width * pd->res->printed_hres / 72;
   pd->image_left_position = pd->image_left * pd->micro_units / 72;
+  /*
+   * Many printers print extremely slowly if the starting position
+   * is not a multiple of 8
+   */
+  if (escp2_horizontal_position_alignment(v) > 1)
+    pd->image_left_position =
+      (pd->image_left_position / escp2_horizontal_position_alignment(v)) *
+      escp2_horizontal_position_alignment(v);
 
 
   pd->page_bottom += extra_top + 1;
@@ -3012,7 +3067,8 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
   stp_allocate_component_data(v, "Driver", NULL, NULL, pd);
 
   pd->inkname = get_inktype(v);
-  if (stp_check_boolean_parameter(v, "UseGloss", STP_PARAMETER_ACTIVE) &&
+  if (pd->inkname->inkset != INKSET_EXTENDED &&
+      stp_check_boolean_parameter(v, "UseGloss", STP_PARAMETER_ACTIVE) &&
       stp_get_boolean_parameter(v, "UseGloss"))
     pd->use_aux_channels = 1;
   else
@@ -3081,6 +3137,7 @@ static const stp_printfuncs_t print_escp2_printfuncs =
   escp2_parameters,
   stp_default_media_size,
   escp2_imageable_area,
+  escp2_maximum_imageable_area,
   escp2_limit,
   escp2_print,
   escp2_describe_resolution,
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index e49f7e6..9ad648f 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.100 2006/01/10 03:15:30 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -317,6 +317,7 @@ typedef struct
 
 typedef struct
 {
+  const char *name;
   const input_slot_t *slots;
   size_t n_input_slots;
 } input_slot_list_t;
@@ -454,6 +455,8 @@ typedef struct escp2_printer
   short		initial_vertical_offset;
   short		black_initial_vertical_offset;
   short		extra_720dpi_separation;
+  short		horizontal_position_alignment; /* Horizontal alignment */
+					       /* for good performance */
 /*****************************************************************************/
   /* Paper size limits */
   int		max_paper_width; /* Maximum paper width, in points */
@@ -559,6 +562,8 @@ extern const paper_adjustment_list_t stpi_escp2_r800_matte_paper_adjustment_list
 extern const paper_adjustment_list_t stpi_escp2_picturemate_paper_adjustment_list;
 
 extern const res_t *const stpi_escp2_superfine_reslist[];
+extern const res_t *const stpi_escp2_r2400_reslist[];
+extern const res_t *const stpi_escp2_cx3650_reslist[];
 extern const res_t *const stpi_escp2_no_printer_weave_reslist[];
 extern const res_t *const stpi_escp2_pro_reslist[];
 extern const res_t *const stpi_escp2_sp5000_reslist[];
@@ -716,5 +721,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.100 2006/01/10 03:15:30 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $".
  */
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index b57233c..0f6faa6 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.150 2005/07/03 22:13:39 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.153 2006/05/12 00:56:09 rlk Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -817,9 +817,8 @@ lexmark_get_model_capabilities(int model)
   if (i != -1) {
     return &(lexmark_model_capabilities[i]);
   }
-#ifdef DEBUG
-  stp_erprintf("lexmark: model %d not found in capabilities list.\n",model);
-#endif
+  stp_deprintf(STP_DBG_LEXMARK,
+	       "lexmark: model %d not found in capabilities list.\n",model);
   return &(lexmark_model_capabilities[0]);
 }
 
@@ -961,9 +960,9 @@ lexmark_source_type(const char *name, const lexmark_cap_t * caps)
       if (!strcmp(name,"ManualNP")) return 1;
     }
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: Unknown source type '%s' - reverting to auto\n",name);
-#endif
+  stp_deprintf(STP_DBG_LEXMARK,
+	       "lexmark: Unknown source type '%s' - reverting to auto\n",name);
+
   return 4;
 }
 
@@ -981,9 +980,7 @@ lexmark_head_offset(int ydpi,                       /* i */
 {
   int i;
 
-#ifdef DEBUG
-  stp_erprintf("  sizie %d,  size_v %d, size_v[0] %d\n", sizeof(*lineoff_buffer), sizeof(lineoff_buffer->v), sizeof(lineoff_buffer->v[0]));
-#endif
+  stp_deprintf(STP_DBG_LEXMARK, "  sizie %d,  size_v %d, size_v[0] %d\n", sizeof(*lineoff_buffer), sizeof(lineoff_buffer->v), sizeof(lineoff_buffer->v[0]));
   memcpy(lineoff_buffer, ink_parameter->head_offset, sizeof(*lineoff_buffer));
 
   for (i=0; i < (sizeof(lineoff_buffer->v) / sizeof(lineoff_buffer->v[0])); i++) {
@@ -1020,12 +1017,10 @@ lexmark_size_type(const stp_vars_t *v, const lexmark_cap_t * caps)
       if (!strcmp(name,"w288h144"))	return 0x2d;
       /* custom */
 
-#ifdef DEBUG
-      stp_erprintf("lexmark: Unknown paper size '%s' - using custom\n",name);
+      stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: Unknown paper size '%s' - using custom\n",name);
     } else {
-      stp_erprintf("lexmark: Couldn't look up paper size %dx%d - "
+      stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: Couldn't look up paper size %dx%d - "
 	      "using custom\n",stp_get_page_height(v), stp_get_page_width(v));
-#endif
     }
   return 0;
 }
@@ -1064,7 +1059,7 @@ static const lexmark_res_t
 	  res++;
 	}
     }
-  stp_erprintf("lexmark_get_resolution_para: resolution not found (%s)\n", resolution);
+  stp_deprintf(STP_DBG_LEXMARK, "lexmark_get_resolution_para: resolution not found (%s)\n", resolution);
   return NULL;
 }
 
@@ -1152,7 +1147,7 @@ lexmark_describe_output(const stp_vars_t *v)
 
   ink_parameter = lexmark_get_ink_parameter(ink_type, printing_color, caps, v);
 
-  if (ink_parameter->used_colors == COLOR_MODE_K ||
+  if (!ink_parameter || ink_parameter->used_colors == COLOR_MODE_K ||
       caps->inks == LEXMARK_INK_K || !printing_color)
     return "Grayscale";
   else if (!(ink_parameter->used_colors & COLOR_MODE_K))
@@ -1279,8 +1274,9 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "PrintingMode") == 0)
     {
       description->bounds.str = stp_string_list_create();
-      stp_string_list_add_string
-	(description->bounds.str, "Color", _("Color"));
+      if (caps->inks != LEXMARK_INK_K)
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
       stp_string_list_add_string
 	(description->bounds.str, "BW", _("Black and White"));
       description->deflt.str =
@@ -1434,11 +1430,9 @@ lexmark_init_printer(const stp_vars_t *v, const lexmark_cap_t * caps,
 
 
   /*
-#ifdef DEBUG
-  stp_erprintf("lexmark: printable size = %dx%d (%dx%d) %02x%02x %02x%02x\n",
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: printable size = %dx%d (%dx%d) %02x%02x %02x%02x\n",
 	  page_width,page_height,printable_width,printable_length,
 	  arg_70_1,arg_70_2,arg_70_3,arg_70_4);
-#endif
   */
   return 1;
 }
@@ -1455,8 +1449,8 @@ static void lexmark_deinit_printer(const stp_vars_t *v, const lexmark_cap_t * ca
 			buffer[2] = 0x7;
 			buffer[3] = 0x65;
 
+			stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: <<eject page.>> %x %x %x %x\n", buffer[0],  buffer[1], buffer[2], buffer[3]);
 #ifdef DEBUG
-			stp_erprintf("lexmark: <<eject page.>> %x %x %x %x   %lx\n", buffer[0],  buffer[1], buffer[2], buffer[3], dbgfileprn);
 			lex_write_tmp_file(dbgfileprn, (void *)&(buffer[0]), 4);
 #endif
 			/* eject page */
@@ -1467,8 +1461,8 @@ static void lexmark_deinit_printer(const stp_vars_t *v, const lexmark_cap_t * ca
 		case m_z42:
 		{
 			unsigned char buffer[12] = {0x1B,0x2A,0x07,0x65,0x1B,0x2A,0x82,0x00,0x00,0x00,0x00,0xAC};
+			stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: <<eject page.>>\n");
 #ifdef DEBUG
-			stp_erprintf("lexmark: <<eject page.>>\n");
 			lex_write_tmp_file(dbgfileprn, (void *)&(buffer[0]), 12);
 #endif
 			/* eject page */
@@ -1485,9 +1479,7 @@ static void lexmark_deinit_printer(const stp_vars_t *v, const lexmark_cap_t * ca
 		    0x1b, 0x33, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33
 		  };
 
-#ifdef DEBUG
-			stp_erprintf("Headpos: %d\n", lxm3200_headpos);
-#endif
+			stp_dprintf(STP_DBG_LEXMARK, v, "Headpos: %d\n", lxm3200_headpos);
 
 			lxm3200_linetoeject += 2400;
 			buffer[3] = lxm3200_linetoeject >> 8;
@@ -1543,9 +1535,7 @@ static void paper_shift(const stp_vars_t *v, int offset, const lexmark_cap_t * c
 			break;
 	}
 
-#ifdef DEBUG
-	stp_erprintf("Lines to eject: %d\n", lxm3200_linetoeject);
-#endif
+	stp_dprintf(STP_DBG_LEXMARK, v, "Lines to eject: %d\n", lxm3200_linetoeject);
 }
 
 /*
@@ -1709,9 +1699,7 @@ lexmark_do_print(stp_vars_t *v, stp_image_t *image)
    */
 
   stp_describe_resolution(v, &xdpi, &ydpi);
-#ifdef DEBUG
-  stp_erprintf("lexmark: resolution=%dx%d\n",xdpi,ydpi);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: resolution=%dx%d\n",xdpi,ydpi);
 
   switch (res_para_ptr->resid) {
   case DPI300:
@@ -1736,7 +1724,7 @@ lexmark_do_print(stp_vars_t *v, stp_image_t *image)
 
 #ifdef DEBUG
   if (res_para_ptr->resid == DPItest) {
-    stp_erprintf("Start test print1\n");
+    stp_dprintf(STP_DBG_LEXMARK, v, "Start test print1\n");
     doTestPrint = 1;
   }
 #endif
@@ -1749,10 +1737,8 @@ densityDivisor /= 1.2;
   nozzle_separation = ydpi / physical_ydpi;
 
   horizontal_passes = xdpi / physical_xdpi;
-#ifdef DEBUG
-  stp_erprintf("lexmark: horizontal_passes %i, xdpi %i, physical_xdpi %i\n",
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: horizontal_passes %i, xdpi %i, physical_xdpi %i\n",
 	       horizontal_passes, xdpi, physical_xdpi);
-#endif
 
 
 
@@ -1760,9 +1746,7 @@ densityDivisor /= 1.2;
   if (!strcmp(resolution+(strlen(resolution)-3),"DMT") &&
       (caps->features & LEXMARK_CAP_DMT)) {
     use_dmt= 1;
-#ifdef DEBUG
-    stpi_erprintf("lexmark: using drop modulation technology\n");
-#endif
+    stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: using drop modulation technology\n");
   }
 
   /*
@@ -1779,9 +1763,7 @@ densityDivisor /= 1.2;
   page_width = page_right - page_left;
   page_height = page_bottom - page_top;
 
-#ifdef DEBUG
-  stp_erprintf("page_right %d, page_left %d, page_top %d, page_bottom %d, left %d, top %d\n",page_right, page_left, page_top, page_bottom,left, top);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "page_right %d, page_left %d, page_top %d, page_bottom %d, left %d, top %d\n",page_right, page_left, page_top, page_bottom,left, top);
 
   image_height = stp_image_height(image);
   image_width = stp_image_width(image);
@@ -1803,22 +1785,18 @@ densityDivisor /= 1.2;
   out_width  = xdpi * out_width / 72;
   out_height = ydpi * out_height / 72;
 
-#ifdef DEBUG
 
-  stp_erprintf("border: left %ld, x_raster_res %d, offser_left %ld\n", left, caps->x_raster_res, caps->offset_left_border);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "border: left %d, x_raster_res %d, offser_left %d\n", left, caps->x_raster_res, caps->offset_left_border);
 
   left = ((caps->x_raster_res * left) / 72) + caps->offset_left_border;
 
-#ifdef DEBUG
-  stp_erprintf("border: left %d\n", left);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "border: left %d\n", left);
 
 
 
 #ifdef DEBUG
   if (doTestPrint == 1) {
-    stp_erprintf("Start test print\n");
+    stp_dprintf(STP_DBG_LEXMARK, v, "Start test print\n");
     testprint(&td);
     out_width = td.x;
     out_height = td.y;
@@ -1845,9 +1823,7 @@ densityDivisor /= 1.2;
     buf_length= length;
   }
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: buflength is %d!\n",buf_length);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: buflength is %d!\n",buf_length);
 
 
   /* Now we know the color which are used, let's get the memory for every color image */
@@ -1892,17 +1868,14 @@ densityDivisor /= 1.2;
   else
     stp_set_string_parameter(v, "STPIOutputType", "CMY");
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: driver will use colors ");
-  if (cols.p.c)     stp_erputc('c');
-  if (cols.p.C)     stp_erputc('C');
-  if (cols.p.m)     stp_erputc('m');
-  if (cols.p.M)     stp_erputc('M');
-  if (cols.p.y)     stp_erputc('y');
-  if (cols.p.Y)     stp_erputc('Y');
-  if (cols.p.k)     stp_erputc('k');
-  stp_erprintf("\n");
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: driver will use colors %c%c%c%c%c%c%c\n",
+	      (cols.p.c) ? 'c' : ' ',
+	      (cols.p.C) ? 'C' : ' ',
+	      (cols.p.m) ? 'm' : ' ',
+	      (cols.p.M) ? 'M' : ' ',
+	      (cols.p.y) ? 'y' : ' ',
+	      (cols.p.Y) ? 'Y' : ' ',
+	      (cols.p.k) ? 'k' : ' ');
 
   /* initialize soft weaveing */
   privdata.ink_parameter = ink_parameter;
@@ -1943,16 +1916,13 @@ densityDivisor /= 1.2;
       stp_set_float_parameter(v, "Density", 1.0);
     }
 
-#ifdef DEBUG
-  stp_erprintf("density is %f\n",stp_get_parameter(v, "Density"));
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "density is %f\n",
+	      stp_get_float_parameter(v, "Density"));
 
-#ifdef DEBUG
-  stp_erprintf("density is %f and will be changed to %f  (%f)\n",
+  stp_dprintf(STP_DBG_LEXMARK, v, "density is %f and will be changed to %f  (%f)\n",
 		stp_get_float_parameter(v, "Density"),
 		stp_get_float_parameter(v, "Density") / densityDivisor,
 		densityDivisor);
-#endif
 
   /* Lexmark do not have differnet pixel sizes. We have to correct the density according the print resolution. */
   stp_scale_float_parameter(v, "Density", 1.0 / densityDivisor);
@@ -1985,9 +1955,7 @@ densityDivisor /= 1.2;
   if (stp_get_float_parameter(v, "Density") > 1.0)
     stp_set_float_parameter(v, "Density", 1.0);
 
-#ifdef DEBUG
-  stp_erprintf("density is %f\n",stp_get_float_parameter(v, "Density"));
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "density is %f\n",stp_get_float_parameter(v, "Density"));
 
 
   if (!stp_check_float_parameter(v, "GCRLower", STP_PARAMETER_ACTIVE))
@@ -2003,6 +1971,23 @@ densityDivisor /= 1.2;
   /*
     if (use_glossy_film)
   */
+  if (cols.p.k)
+    {
+      stp_dither_add_channel(v, cols.p.k, STP_ECOLOR_K, 0);
+      stp_channel_set_black_channel(v, STP_ECOLOR_K);
+    }
+  if (cols.p.c)
+    stp_dither_add_channel(v, cols.p.c, STP_ECOLOR_C, 0);
+  if (cols.p.C)
+    stp_dither_add_channel(v, cols.p.C, STP_ECOLOR_C, 1);
+  if (cols.p.m)
+    stp_dither_add_channel(v, cols.p.m, STP_ECOLOR_M, 0);
+  if (cols.p.M)
+    stp_dither_add_channel(v, cols.p.M, STP_ECOLOR_M, 1);
+  if (cols.p.y)
+    stp_dither_add_channel(v, cols.p.y, STP_ECOLOR_Y, 0);
+  if (cols.p.Y)
+    stp_dither_add_channel(v, cols.p.Y, STP_ECOLOR_Y, 1);
 
   if (!use_dmt) {
     if (cols.p.C)
@@ -2093,9 +2078,7 @@ densityDivisor /= 1.2;
   out_channels = stp_color_init(v, image, 65536);
 
   /* calculate the memory we need for one line of the printer image (hopefully we are right) */
-#ifdef DEBUG
-  stp_erprintf("---------- buffer mem size = %d\n", (((((pass_length/8)*11)/10)+40) * out_width)+200);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "---------- buffer mem size = %d\n", (((((pass_length/8)*11)/10)+40) * out_width)+200);
 
   errdiv  = image_height / out_height;
   errmod  = image_height % out_height;
@@ -2103,29 +2086,13 @@ densityDivisor /= 1.2;
   errlast = -1;
   errline  = 0;
 
-  if (cols.p.k)
-    {
-      stp_dither_add_channel(v, cols.p.k, STP_ECOLOR_K, 0);
-      stp_channel_set_black_channel(v, STP_ECOLOR_K);
-    }
-  if (cols.p.c)
-    stp_dither_add_channel(v, cols.p.c, STP_ECOLOR_C, 0);
-  if (cols.p.C)
-    stp_dither_add_channel(v, cols.p.C, STP_ECOLOR_C, 1);
-  if (cols.p.m)
-    stp_dither_add_channel(v, cols.p.m, STP_ECOLOR_M, 0);
-  if (cols.p.M)
-    stp_dither_add_channel(v, cols.p.M, STP_ECOLOR_M, 1);
-  if (cols.p.y)
-    stp_dither_add_channel(v, cols.p.y, STP_ECOLOR_Y, 0);
-  if (cols.p.Y)
-    stp_dither_add_channel(v, cols.p.Y, STP_ECOLOR_Y, 1);
   privdata.hoffset = left;
   privdata.ydpi = ydpi;
   privdata.model = model;
   privdata.width = out_width;
   privdata.xdpi = xdpi;
   privdata.physical_xdpi = physical_xdpi;
+  privdata.bitwidth = 1;
 
   for (y = 0; y < out_height; y ++)
     {
@@ -2193,6 +2160,7 @@ static const stp_printfuncs_t print_lexmark_printfuncs =
   lexmark_parameters,
   stp_default_media_size,
   lexmark_imageable_area,
+  lexmark_imageable_area,
   lexmark_limit,
   lexmark_print,
   lexmark_describe_resolution,
@@ -2245,9 +2213,7 @@ lexmark_init_line(int mode, unsigned char *prnBuf,
 
     /* K could only be present if black is printed only. */
     if ((mode & COLOR_MODE_K) || (mode & (COLOR_MODE_K | COLOR_MODE_LC | COLOR_MODE_LM))) {
-#ifdef DEBUG
-      stp_erprintf("set  photo/black catridge \n");
-#endif
+      stp_deprintf(STP_DBG_LEXMARK, "set  photo/black catridge \n");
       prnBuf[LX_Z52_COLOR_MODE_POS] = LX_Z52_BLACK_PRINT;
 
       if (direction) {
@@ -2255,9 +2221,7 @@ lexmark_init_line(int mode, unsigned char *prnBuf,
 	offset += ink_parameter->h_direction_offset;
       }
     } else {
-#ifdef DEBUG
-      stp_erprintf("set color cartridge \n");
-#endif
+      stp_deprintf(STP_DBG_LEXMARK, "set color cartridge \n");
       prnBuf[LX_Z52_COLOR_MODE_POS] = LX_Z52_COLOR_PRINT;
 
       if (direction) {
@@ -2456,30 +2420,22 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
   int anyCol=0;
   int colIndex;
   int rwidth; /* real with used at printing (includes shift between even & odd nozzles) */
-#ifdef DEBUG
-  /* stp_erprintf("<%c>",("CMYKcmy"[coloridx])); */
-  stp_erprintf("pass length %d\n", pass_length);
-#endif
+  /* stp_dprintf(STP_DBG_LEXMARK, v, "<%c>",("CMYKcmy"[coloridx])); */
+  stp_dprintf(STP_DBG_LEXMARK, v, "pass length %d\n", pass_length);
 
 
   /* first, we check the length of the line an cut it if necessary. */
   if ((((width*caps->x_raster_res)/xdpi)+offset) > ((caps->max_paper_width*caps->x_raster_res)/72)) {
     /* line too long !! Cut the line */
-#ifdef DEBUG
-   stp_erprintf("!! Line too long !! reduce it from %d", width);
-#endif
+   stp_dprintf(STP_DBG_LEXMARK, v, "!! Line too long !! reduce it from %d", width);
     width = ((((caps->max_paper_width*caps->x_raster_res)/72) - offset)*xdpi)/caps->x_raster_res;
-#ifdef DEBUG
-   stp_erprintf(" down to %d\n", width);
-#endif
+   stp_dprintf(STP_DBG_LEXMARK, v, " down to %d\n", width);
   }
 
 
   /* we have to write the initial sequence for a line */
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: printer line initialized.\n");
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: printer line initialized.\n");
 
   if (direction) {
     /* left to right */
@@ -2500,9 +2456,7 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
 			ink_parameter, caps);
 
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: xStart %d, xEnd %d, xIter %d.\n", xStart, xEnd, xIter);
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: xStart %d, xEnd %d, xIter %d.\n", xStart, xEnd, xIter);
 
   /* now we can start to write the pixels */
   yCount = 2;
@@ -2623,15 +2577,11 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
       anyCol = 1;
     } else {
       /* there are no dots, make empy package */
-#ifdef DEBUG
-      /*     stp_erprintf("-- empty col %i\n", x); */
-#endif
+      /*     stp_dprintf(STP_DBG_LEXMARK, v, "-- empty col %i\n", x); */
     }
   }
 
-#ifdef DEBUG
-  stp_erprintf("lexmark: 4\n");
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: 4\n");
 
   clen=((unsigned char *)p)-prnBuf;
 
@@ -2664,13 +2614,11 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
     stp_zfwrite((const char *)prnBuf,1,clen,v);
 #ifdef DEBUG
     lex_write_tmp_file(dbgfileprn, (void *)prnBuf,clen);
-    stp_erprintf("lexmark: line written.\n");
 #endif
+    stp_dprintf(STP_DBG_LEXMARK, v, "lexmark: line written.\n");
     return 1;
   } else {
-#ifdef DEBUG
-    stp_erprintf("-- empty line\n");
-#endif
+    stp_dprintf(STP_DBG_LEXMARK, v, "-- empty line\n");
     return 0;
   }
 
@@ -2747,26 +2695,13 @@ flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 				      {0, NULL, 128/2, 192/2, 64}};
 
 
-#ifdef DEBUG
-  stp_erprintf("Lexmark: flush_pass, here we are !\n");
-  stp_erprintf("  passno %i, pd->ncolors %i, width %d, lwidth %d, linecount k % d, linecount m % d, bitwidth %d\n",
-	       passno, pd->ncolors, width, lwidth, /*linecount[0].p.k, linecount[0].p.m,*/ pd->bitwidth);
-  stp_erprintf("microoffset %d, vertical_subpass %d, pd->horizontal_weave %d\n", microoffset,vertical_subpass, pd->horizontal_weave);
-
-  stp_erprintf("Lexmark: last_pass_offset %d, logicalpassstart %d\n", pd->last_pass_offset, pass->logicalpassstart);
-  stp_erprintf("Lexmark: vertical adapt: caps->y_raster_res %d, ydpi %d,  \n", caps->y_raster_res, ydpi);
-
-#endif
-
-  if (1) { /* wisi */
+  stp_dprintf(STP_DBG_LEXMARK, v, "Lexmark: flush_pass, here we are !\n");
+  stp_dprintf(STP_DBG_LEXMARK, v, "  passno %d, pd->ncolors %d, width %d, lwidth %d, bitwidth %d\n",
+	       passno, pd->ncolors, width, lwidth, pd->bitwidth);
+  stp_dprintf(STP_DBG_LEXMARK, v, "microoffset %d, vertical_subpass %d, pd->horizontal_weave %d\n", microoffset,vertical_subpass, pd->horizontal_weave);
 
-#ifdef DEBUG
-  stp_erprintf("1\n");
-  stp_erprintf("\n");
-  stp_erprintf("lineoffs[0].v[j]  %d\n", lineoffs[0].v[0]);
-  stp_erprintf("lineoffs[0].v[j]  %d\n", lineoffs[0].v[1]);
-
-#endif
+  stp_dprintf(STP_DBG_LEXMARK, v, "Lexmark: last_pass_offset %d, logicalpassstart %d\n", pd->last_pass_offset, pass->logicalpassstart);
+  stp_dprintf(STP_DBG_LEXMARK, v, "Lexmark: vertical adapt: caps->y_raster_res %d, ydpi %d,  \n", caps->y_raster_res, ydpi);
 
   switch (physical_xdpi) {
   case 300:
@@ -2779,15 +2714,16 @@ flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
     prn_mode = PRINT_MODE_1200;
     break;
   default:
-#ifdef DEBUG
-    stp_erprintf("Eror: Unsupported phys resolution (%d)\n", physical_xdpi);
-#endif
+    stp_dprintf(STP_DBG_LEXMARK, v, "Eror: Unsupported phys resolution (%d)\n", physical_xdpi);
     return;
     break;
   }
   /* calculate paper shift and adapt actual resoution to physical positioning resolution */
   paperShift = (pass->logicalpassstart - pd->last_pass_offset) * (caps->y_raster_res/ydpi);
-
+  for (j = 0; j < pd->ncolors; j++)
+    stp_dprintf(STP_DBG_LEXMARK, v, "Color %d: active %d line %p jets %d offset %ld\n",
+		j, lineactive[0].v[j], bufs[0].v[j], linecount[0].v[j],
+		lineoffs[0].v[j]);
 
       /*** do we have to print something with the color cartridge ? ***/
       if ((STP_ECOLOR_C < pd->ncolors) && (lineactive[0].v[STP_ECOLOR_C] > 0))
@@ -2827,9 +2763,7 @@ flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 
 
 
-#ifdef DEBUG
-	stp_erprintf("lexmark_write: lwidth %d\n", lwidth);
-#endif
+	stp_dprintf(STP_DBG_LEXMARK, v, "lexmark_write: lwidth %d\n", lwidth);
 	lexmark_write(v,		/* I - Print file or command */
 		      pd->outbuf,/*unsigned char *prnBuf,   mem block to buffer output */
 		      &paperShift,           /* int *paperShift, */
@@ -2950,7 +2884,6 @@ flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
     }
   /* store paper position in respect if there was a paper shift */
   pd->last_pass_offset = pass->logicalpassstart - (paperShift / (caps->y_raster_res/ydpi));
-  }
 
   for (j = 0; j < pd->ncolors; j++)
     {
@@ -2958,9 +2891,7 @@ flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
       linecount[0].v[j] = 0;
     }
 
-#ifdef DEBUG
-  stp_erprintf("lexmark_write finished\n");
-#endif
+  stp_deprintf(STP_DBG_LEXMARK, "lexmark_write finished\n");
 
 }
 
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index a3dc35d..24c6a2c 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.57 2005/10/21 08:55:40 m0m Exp $"
+ * "$Id: print-olympus.c,v 1.58 2006/04/17 02:06:19 rlk Exp $"
  *
  *   Print plug-in Olympus driver for the GIMP.
  *
@@ -1569,11 +1569,12 @@ olympus_parameters(const stp_vars_t *v, const char *name,
 
 
 static void
-olympus_imageable_area(const stp_vars_t *v,
-		   int  *left,
-		   int  *right,
-		   int  *bottom,
-		   int  *top)
+olympus_imageable_area_internal(const stp_vars_t *v,
+				int  use_maximum_area,
+				int  *left,
+				int  *right,
+				int  *bottom,
+				int  *top)
 {
   int width, height;
   int i;
@@ -1597,8 +1598,9 @@ olympus_imageable_area(const stp_vars_t *v,
           stp_default_media_size(v, &width, &height);
     
           
-	  if (olympus_feature(caps, OLYMPUS_FEATURE_BORDERLESS)
-	    && stp_get_boolean_parameter(v, "Borderless"))
+	  if (use_maximum_area ||
+	      (olympus_feature(caps, OLYMPUS_FEATURE_BORDERLESS) &&
+	       stp_get_boolean_parameter(v, "Borderless")))
             {
               *left = 0;
               *top  = 0;
@@ -1618,6 +1620,26 @@ olympus_imageable_area(const stp_vars_t *v,
 }
 
 static void
+olympus_imageable_area(const stp_vars_t *v,
+		       int  *left,
+		       int  *right,
+		       int  *bottom,
+		       int  *top)
+{
+  olympus_imageable_area_internal(v, 0, left, right, bottom, top);
+}
+
+static void
+olympus_maximum_imageable_area(const stp_vars_t *v,
+			       int  *left,
+			       int  *right,
+			       int  *bottom,
+			       int  *top)
+{
+  olympus_imageable_area_internal(v, 1, left, right, bottom, top);
+}
+
+static void
 olympus_limit(const stp_vars_t *v,			/* I */
 	    int *width, int *height,
 	    int *min_width, int *min_height)
@@ -2156,6 +2178,7 @@ static const stp_printfuncs_t print_olympus_printfuncs =
   olympus_parameters,
   stp_default_media_size,
   olympus_imageable_area,
+  olympus_maximum_imageable_area,
   olympus_limit,
   olympus_print,
   olympus_describe_resolution,
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index ea41b4f..1feaacf 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.140 2005/10/18 02:08:17 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.142 2006/05/12 00:53:18 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -2107,7 +2107,7 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
   stp_deprintf(STP_DBG_PCL, "privdata.do_cret = %d\n", privdata.do_cret);
   stp_deprintf(STP_DBG_PCL, "privdata.do_cretb = %d\n", privdata.do_cretb);
 
-  if (ink_type)
+  if (ink_type && printing_color)
     privdata.do_6color = (strcmp(ink_type, "Photo") == 0);
   else
     privdata.do_6color = 0;
@@ -2534,8 +2534,9 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
 
   if (privdata.do_cret)			/* 4-level printing for 800/1120 */
     {
-      stp_dither_set_inks_simple(v, STP_ECOLOR_Y, 3, dot_sizes_use, 1.0, 0.08);
-      if (!privdata.do_cretb)
+      if (yellow)
+	stp_dither_set_inks_simple(v, STP_ECOLOR_Y, 3, dot_sizes_use, 1.0, 0.08);
+      if (black && !privdata.do_cretb)
         stp_dither_set_inks_simple(v, STP_ECOLOR_K, 3, dot_sizes_use, 1.0, 1.0);
 
       /* Note: no printer I know of does both CRet (4-level) and 6 colour, but
@@ -2550,10 +2551,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
 	}
       else
 	{
-	  stp_dither_set_inks_simple(v, STP_ECOLOR_C, 3, dot_sizes_use, 1.0,
-				      0.31 / .5);
-	  stp_dither_set_inks_simple(v, STP_ECOLOR_M, 3, dot_sizes_use, 1.0,
-				      0.61 / .7);
+	  if (cyan)
+	    stp_dither_set_inks_simple(v, STP_ECOLOR_C, 3, dot_sizes_use, 1.0,
+				       0.31 / .5);
+	  if (magenta)
+	    stp_dither_set_inks_simple(v, STP_ECOLOR_M, 3, dot_sizes_use, 1.0,
+				       0.61 / .7);
 	}
     }
   else if (privdata.do_6color)
@@ -2714,6 +2717,7 @@ static const stp_printfuncs_t print_pcl_printfuncs =
   pcl_parameters,
   stp_default_media_size,
   pcl_imageable_area,
+  pcl_imageable_area,
   pcl_limit,
   pcl_print,
   pcl_describe_resolution,
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 9d7e20e..d85dd94 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.81 2005/10/10 12:52:29 rlk Exp $"
+ * "$Id: print-ps.c,v 1.84 2006/04/17 02:06:19 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -189,6 +189,8 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
 	    stp_string_list_param(description->bounds.str, 0)->name;
 	  description->is_active = 1;
 	}
+      else if (strcmp(name, "PPDFile") == 0)
+	description->is_active = 1;
       else
 	description->is_active = 0;
       return;
@@ -281,6 +283,7 @@ ps_media_size(const stp_vars_t *v, int *width, int *height)
 
 static void
 ps_imageable_area_internal(const stp_vars_t *v,      /* I */
+			   int  use_max_area, /* I - Use maximum area */
 			   int  *left,	/* O - Left position in points */
 			   int  *right,	/* O - Right position in points */
 			   int  *bottom, /* O - Bottom position in points */
@@ -308,6 +311,17 @@ ps_imageable_area_internal(const stp_vars_t *v,      /* I */
 	  *right  = (int)fright;
 	  *bottom = height - (int)fbottom;
 	  *top    = height - (int)ftop;
+	  if (use_max_area)
+	    {
+	      if (*left > 0)
+		*left = 0;
+	      if (*right < width)
+		*right = width;
+	      if (*top > 0)
+		*top = 0;
+	      if (*bottom < height)
+		*bottom = height;
+	    }
 	}
       else
 	*left = *right = *bottom = *top = 0;
@@ -316,10 +330,10 @@ ps_imageable_area_internal(const stp_vars_t *v,      /* I */
     }
   else
     {
-      *left   = 18;
-      *right  = width - 18;
-      *top    = 36;
-      *bottom = height - 36;
+      *left   = 0;
+      *right  = width;
+      *top    = 0;
+      *bottom = height;
     }
 }
 
@@ -331,7 +345,19 @@ ps_imageable_area(const stp_vars_t *v,      /* I */
                   int  *top)		/* O - Top position in points */
 {
   setlocale(LC_ALL, "C");
-  ps_imageable_area_internal(v, left, right, bottom, top);
+  ps_imageable_area_internal(v, 0, left, right, bottom, top);
+  setlocale(LC_ALL, "");
+}
+
+static void
+ps_maximum_imageable_area(const stp_vars_t *v,      /* I */
+			  int  *left,	/* O - Left position in points */
+			  int  *right,	/* O - Right position in points */
+			  int  *bottom,	/* O - Bottom position in points */
+			  int  *top)	/* O - Top position in points */
+{
+  setlocale(LC_ALL, "C");
+  ps_imageable_area_internal(v, 1, left, right, bottom, top);
   setlocale(LC_ALL, "");
 }
 
@@ -406,6 +432,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 		page_bottom,	/* Bottom of page */
 		page_width,	/* Width of page */
 		page_height,	/* Height of page */
+		paper_width,	/* Width of physical page */
+		paper_height,	/* Height of physical page */
 		out_width,	/* Width of image on page */
 		out_height,	/* Height of image on page */
 		out_channels,	/* Output bytes per pixel */
@@ -452,8 +480,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   out_height = stp_get_height(v);
 
   ps_imageable_area(nv, &page_left, &page_right, &page_bottom, &page_top);
-  left -= page_left;
-  top -= page_top;
+  ps_media_size(v, &paper_width, &paper_height);
   page_width = page_right - page_left;
   page_height = page_bottom - page_top;
 
@@ -466,9 +493,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 
   curtime = time(NULL);
 
-  left += page_left;
-
-  top = page_height - top;
+  top = paper_height - top;
 
   stp_dprintf(STP_DBG_PS, v,
 	      "out_width = %d, out_height = %d\n", out_width, out_height);
@@ -476,6 +501,12 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 	      "page_left = %d, page_right = %d, page_bottom = %d, page_top = %d\n",
 	      page_left, page_right, page_bottom, page_top);
   stp_dprintf(STP_DBG_PS, v, "left = %d, top = %d\n", left, top);
+  stp_dprintf(STP_DBG_PS, v, "page_width = %d, page_height = %d\n",
+	      page_width, page_height);
+
+  stp_dprintf(STP_DBG_PS, v, "bounding box l %d b %d r %d t %d\n",
+	      page_left, paper_height - page_bottom,
+	      page_right, paper_height - page_top);
 
   stp_puts("%!PS-Adobe-3.0\n", v);
 #ifdef HAVE_CONFIG_H
@@ -487,7 +518,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   stp_zprintf(v, "%%%%CreationDate: %s", ctime(&curtime));
   stp_puts("%Copyright: 1997-2002 by Michael Sweet (mike@easysw.com) and Robert Krawitz (rlk@alum.mit.edu)\n", v);
   stp_zprintf(v, "%%%%BoundingBox: %d %d %d %d\n",
-	      left, top - out_height, left + out_width, top);
+	      page_left, paper_height - page_bottom,
+	      page_right, paper_height - page_top);
   stp_puts("%%DocumentData: Clean7Bit\n", v);
   stp_zprintf(v, "%%%%LanguageLevel: %d\n", model + 1);
   stp_puts("%%Pages: 1\n", v);
@@ -956,6 +988,7 @@ static const stp_printfuncs_t print_ps_printfuncs =
   ps_parameters,
   ps_media_size,
   ps_imageable_area,
+  ps_maximum_imageable_area,
   ps_limit,
   ps_print,
   ps_describe_resolution,
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index dfad151..b63f3d7 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-raw.c,v 1.37 2005/09/17 21:54:34 rlk Exp $"
+ * "$Id: print-raw.c,v 1.38 2006/04/17 02:06:19 rlk Exp $"
  *
  *   Print plug-in RAW driver for the GIMP.
  *
@@ -325,6 +325,7 @@ static const stp_printfuncs_t print_raw_printfuncs =
   raw_parameters,
   stp_default_media_size,
   raw_imageable_area,
+  raw_imageable_area,
   raw_limit,
   raw_print,
   raw_describe_resolution,
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index 498e839..e33e737 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.63 2005/06/29 01:42:35 rlk Exp $"
+ * "$Id: print-weave.c,v 1.64 2006/03/26 01:07:07 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1146,6 +1146,19 @@ stp_initialize_weave(stp_vars_t *v,
 	  sw->linebases[i].v[j] = NULL;
 	}
     }
+  stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+	      "Weave parameters: separation %d jets %d (%d) h %d v %d v_sub %d\n",
+	      sw->separation, sw->jets, sw->virtual_jets, osample,
+	      v_subpasses, v_subsample);
+  stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+	      "      ncolors %d bpp %d width %d (%d) line_count %d first %d last %d\n",
+	      sw->ncolors, sw->bitwidth, linewidth, sw->horizontal_width,
+	      sw->vertical_height, first_line, last_line);
+  stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+	      "      oversample %d line buffer count %d total buffer %d\n",
+	      sw->oversample, sw->vmod,
+	      sw->vmod * sw->virtual_jets * sw->bitwidth *
+	      sw->ncolors * sw->horizontal_width);
   stp_allocate_component_data(v, "Weave", NULL, stpi_destroy_weave, sw);
   return;
 }
@@ -1182,7 +1195,7 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw,
 
   memcpy(&(wsw->wcache), w, sizeof(stp_weave_t));
   w->pass = (w->pass * sw->repeat_count) + sub_repeat_count;
-  stp_dprintf(STP_DBG_WEAVE_PARAMS, v, "row %d, jet %d of pass %d "
+  stp_dprintf(STP_DBG_ROWS, v, "row %d, jet %d of pass %d "
 	      "(pos %d, start %d, end %d, missing rows %d)\n",
 	      w->row, w->jet, w->pass, w->logicalpassstart, w->physpassstart,
 	      w->physpassend, w->missingstartrows);
diff --git a/src/main/printers.c b/src/main/printers.c
index e2f0f2e..d182637 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.75 2005/04/16 03:02:08 rlk Exp $"
+ * "$Id: printers.c,v 1.78 2006/04/17 23:33:56 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -42,6 +42,17 @@
 #define FMIN(a, b) ((a) < (b) ? (a) : (b))
 
 
+static void stpi_printvars_freefunc(void *item);
+static const char* stpi_printvars_namefunc(const void *item);
+
+static stp_list_t *printvars_list = NULL;
+
+typedef struct stp_printvars
+{
+  const char *name;
+  stp_vars_t *printvars;
+} stp_printvars_t;
+
 static void stpi_printer_freefunc(void *item);
 static const char* stpi_printer_namefunc(const void *item);
 static const char* stpi_printer_long_namefunc(const void *item);
@@ -59,6 +70,18 @@ struct stp_printer
   stp_vars_t *printvars;
 };
 
+static void
+stpi_init_printvars_list(void)
+{
+  if (!printvars_list)
+    {
+      printvars_list = stp_list_create();
+      stp_list_set_freefunc(printvars_list, stpi_printvars_freefunc);
+      stp_list_set_namefunc(printvars_list, stpi_printvars_namefunc);
+      stp_list_set_long_namefunc(printvars_list, stpi_printvars_namefunc);
+    }
+}
+
 static int
 stpi_init_printer_list(void)
 {
@@ -69,7 +92,6 @@ stpi_init_printer_list(void)
   stp_list_set_namefunc(printer_list, stpi_printer_namefunc);
   stp_list_set_long_namefunc(printer_list, stpi_printer_long_namefunc);
   /* stp_list_set_sortfunc(printer_list, stpi_printer_sortfunc); */
-
   return 0;
 }
 
@@ -124,6 +146,19 @@ stpi_printer_freefunc(void *item)
   stp_free(printer);
 }
 
+/* ARGSUSED */
+static void
+stpi_printvars_freefunc(void *item)
+{
+}
+
+static const char *
+stpi_printvars_namefunc(const void *item)
+{
+  const stp_printvars_t *printvars = (const stp_printvars_t *) item;
+  return printvars->name;
+}
+
 const char *
 stp_printer_get_driver(const stp_printer_t *printer)
 {
@@ -357,6 +392,15 @@ stp_get_imageable_area(const stp_vars_t *v,
 }
 
 void
+stp_get_maximum_imageable_area(const stp_vars_t *v,
+			       int *left, int *right, int *bottom, int *top)
+{
+  const stp_printfuncs_t *printfuncs =
+    stpi_get_printfuncs(stp_get_printer(v));
+  (printfuncs->maximum_imageable_area)(v, left, right, bottom, top);
+}
+
+void
 stp_get_size_limit(const stp_vars_t *v, int *max_width, int *max_height,
 		   int *min_width, int *min_height)
 {
@@ -789,6 +833,34 @@ stp_verify_printer_params(stp_vars_t *v)
   return answer;
 }
 
+static const stp_vars_t *
+stp_find_params(const char *name, const char *family)
+{
+  if (printvars_list)
+    {
+      char *stmp =
+	stp_malloc(strlen(family) + strlen("::") + strlen(name) + 1);
+      stp_list_item_t *item;
+      strcpy(stmp, family);
+      strcat(stmp, "::");
+      strcat(stmp, name);
+      item = stp_list_get_item_by_name(printvars_list, stmp);
+      if (item)
+	{
+	  stp_free(stmp);
+	  return ((const stp_printvars_t *)
+		  stp_list_item_get_data(item))->printvars;
+	}
+      strcpy(stmp, name);
+      item = stp_list_get_item_by_name(printvars_list, stmp);
+      stp_free(stmp);
+      if (item)
+	return ((const stp_printvars_t *)
+		stp_list_item_get_data(item))->printvars;
+    }
+  return NULL;
+}
+
 int
 stp_family_register(stp_list_t *family)
 {
@@ -854,49 +926,10 @@ stp_family_unregister(stp_list_t *family)
   return 0;
 }
 
-/*
- * Parse the printer node, and return the generated printer.  Returns
- * NULL on failure.
- */
-static stp_printer_t*
-stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
-				const char *family,       /* Family name */
-				const stp_printfuncs_t *printfuncs)
-                                                       /* Family printfuncs */
+static void
+stp_fill_printvars_from_xmltree(stp_mxml_node_t *prop,
+				stp_vars_t *v)
 {
-  stp_mxml_node_t *prop;                                  /* Temporary node pointer */
-  const char *stmp;                                    /* Temporary string */
-  stp_printer_t *outprinter;                 /* Generated printer */
-  int
-    driver = 0,                                       /* Check driver */
-    long_name = 0;
-
-  outprinter = stp_zalloc(sizeof(stp_printer_t));
-  if (!outprinter)
-    return NULL;
-  outprinter->printvars = stp_vars_create();
-  if (outprinter->printvars == NULL)
-    {
-      stp_free(outprinter);
-      return NULL;
-    }
-
-  stmp = stp_mxmlElementGetAttr(printer, "driver");
-  stp_set_driver(outprinter->printvars, (const char *) stmp);
-
-  outprinter->long_name = stp_strdup(stp_mxmlElementGetAttr(printer, "name"));
-  outprinter->manufacturer = stp_strdup(stp_mxmlElementGetAttr(printer, "manufacturer"));
-  outprinter->model = stp_xmlstrtol(stp_mxmlElementGetAttr(printer, "model"));
-  outprinter->family = stp_strdup((const char *) family);
-
-  if (stp_get_driver(outprinter->printvars))
-    driver = 1;
-  if (outprinter->long_name)
-    long_name = 1;
-
-  outprinter->printfuncs = printfuncs;
-
-  prop = printer->child;
   while (prop)
     {
       if (prop->type == STP_MXML_ELEMENT)
@@ -908,41 +941,37 @@ stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
 	      const char *p_name = stp_mxmlElementGetAttr(prop, "name");
 	      stp_mxml_node_t *child = prop->child;
 	      if (!p_type || !p_name)
-		stp_erprintf("Bad property on driver %s\n", outprinter->driver);
+		stp_erprintf("Bad property found!\n");
 	      else if (strcmp(p_type, "float") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
 		    stp_set_float_parameter
-		      (outprinter->printvars, p_name,
-		       stp_xmlstrtod(child->value.text.string));
+		      (v, p_name, stp_xmlstrtod(child->value.text.string));
 		}
 	      else if (strcmp(p_type, "integer") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
 		    stp_set_int_parameter
-		      (outprinter->printvars, p_name,
-		       (int) stp_xmlstrtol(child->value.text.string));
+		      (v, p_name, (int) stp_xmlstrtol(child->value.text.string));
 		}
 	      else if (strcmp(p_type, "boolean") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
 		    stp_set_boolean_parameter
-		      (outprinter->printvars, p_name,
-		       (int) stp_xmlstrtol(child->value.text.string));
+		      (v, p_name, (int) stp_xmlstrtol(child->value.text.string));
 		}
 	      else if (strcmp(p_type, "string") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
 		    stp_set_string_parameter
-		      (outprinter->printvars, p_name, child->value.text.string);
+		      (v, p_name, child->value.text.string);
 		}
 	      else if (strcmp(p_type, "curve") == 0)
 		{
 		  stp_curve_t *curve = stp_curve_create_from_xmltree(child);
 		  if (curve)
 		    {
-		      stp_set_curve_parameter(outprinter->printvars,
-					      p_name, curve);
+		      stp_set_curve_parameter(v, p_name, curve);
 		      stp_curve_destroy(curve);
 		    }
 		}
@@ -951,21 +980,110 @@ stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
 		  stp_array_t *array = stp_array_create_from_xmltree(child);
 		  if (array)
 		    {
-		      stp_set_array_parameter(outprinter->printvars,
-					      p_name, array);
+		      stp_set_array_parameter(v, p_name, array);
 		      stp_array_destroy(array);
 		    }
 		}
 	      else
 		{
-		  stp_erprintf("Bad property %s type %s on driver %s\n",
-			       p_name, p_type, outprinter->driver);
+		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
 		  continue;
 		}
 	    }
 	}
       prop = prop->next;
     }
+} 
+
+static stp_printvars_t *
+stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
+				  const char *family)
+{
+  stp_mxml_node_t *prop;	/* Temporary node pointer */
+  const char *stmp;		/* Temporary string */
+  char *sbuf;
+  stp_printvars_t *outprintvars;
+  outprintvars = stp_zalloc(sizeof(stp_printvars_t));
+  if (!outprintvars)
+    return NULL;
+  outprintvars->printvars = stp_vars_create();
+  if (outprintvars->printvars == NULL)
+    {
+      stp_free(outprintvars);
+      return NULL;
+    }
+  stmp = stp_mxmlElementGetAttr(printer, "name");
+  if (!stmp)
+    {
+      stp_vars_destroy(outprintvars->printvars);
+      stp_free(outprintvars);
+      return NULL;
+    }
+  sbuf = stp_malloc(strlen(family) + strlen("::") + strlen(stmp) + 1);
+  strcpy(sbuf, family);
+  strcat(sbuf, "::");
+  strcat(sbuf, stmp);
+  outprintvars->name = sbuf;
+  prop = printer->child;
+  stp_fill_printvars_from_xmltree(prop, outprintvars->printvars);
+  if (stp_get_debug_level() & STP_DBG_XML)
+    stp_deprintf(STP_DBG_XML, "stp_printvars_create_from_xmltree: %s\n",
+		 outprintvars->name);
+  return outprintvars;
+}
+
+
+/*
+ * Parse the printer node, and return the generated printer.  Returns
+ * NULL on failure.
+ */
+static stp_printer_t*
+stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
+				const char *family,       /* Family name */
+				const stp_printfuncs_t *printfuncs)
+                                                       /* Family printfuncs */
+{
+  stp_mxml_node_t *prop;	/* Temporary node pointer */
+  const char *stmp;		/* Temporary string */
+  stp_printer_t *outprinter;	/* Generated printer */
+  int
+    driver = 0,			/* Check driver */
+    long_name = 0;
+
+  outprinter = stp_zalloc(sizeof(stp_printer_t));
+  if (!outprinter)
+    return NULL;
+  stmp = stp_mxmlElementGetAttr(printer, "parameters");
+  if (stmp && !stp_find_params(stmp, family))
+    stp_erprintf("stp_printer_create_from_xmltree: cannot find parameters %s::%s\n",
+		 family, stmp);
+  if (stmp && stp_find_params(stmp, family))
+    outprinter->printvars = stp_vars_create_copy(stp_find_params(stmp, family));
+  else
+    outprinter->printvars = stp_vars_create();
+  if (outprinter->printvars == NULL)
+    {
+      stp_free(outprinter);
+      return NULL;
+    }
+
+  stmp = stp_mxmlElementGetAttr(printer, "driver");
+  stp_set_driver(outprinter->printvars, (const char *) stmp);
+
+  outprinter->long_name = stp_strdup(stp_mxmlElementGetAttr(printer, "name"));
+  outprinter->manufacturer = stp_strdup(stp_mxmlElementGetAttr(printer, "manufacturer"));
+  outprinter->model = stp_xmlstrtol(stp_mxmlElementGetAttr(printer, "model"));
+  outprinter->family = stp_strdup((const char *) family);
+
+  if (stp_get_driver(outprinter->printvars))
+    driver = 1;
+  if (outprinter->long_name)
+    long_name = 1;
+
+  outprinter->printfuncs = printfuncs;
+
+  prop = printer->child;
+  stp_fill_printvars_from_xmltree(prop, outprinter->printvars);
   if (driver && long_name && printfuncs)
     {
       if (stp_get_debug_level() & STP_DBG_XML)
@@ -993,7 +1111,6 @@ stpi_xml_process_family(stp_mxml_node_t *family)     /* The family node */
   stp_module_t *family_module_data;           /* Family module data */
   stp_family_t *family_data = NULL;  /* Family data */
   int family_valid = 0;                       /* Is family valid? */
-  stp_printer_t *outprinter;         /* Generated printer */
 
   family_module_list = stp_module_get_class(STP_MODULE_CLASS_FAMILY);
   if (!family_module_list)
@@ -1026,13 +1143,23 @@ stpi_xml_process_family(stp_mxml_node_t *family)     /* The family node */
 	  const char *printer_name = printer->value.element.name;
 	  if (!strcmp(printer_name, "printer"))
 	    {
-	      outprinter =
+	      stp_printer_t *outprinter =
 		stp_printer_create_from_xmltree(printer, family_name,
 						family_data->printfuncs);
 	      if (outprinter)
 		stp_list_item_create(family_data->printer_list, NULL,
 				      outprinter);
 	    }
+	  else if (!strcmp(printer_name, "parameters"))
+	    {
+	      stp_printvars_t *printvars =
+		stp_printvars_create_from_xmltree(printer, family_name);
+	      if (printvars)
+		{
+		  stpi_init_printvars_list();
+		  stp_list_item_create(printvars_list, NULL, printvars);
+		}
+	    }
 	}
       printer = printer->next;
     }
diff --git a/src/main/printers.xml b/src/main/printers.xml
index bd4c41f..81d197b 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.140 2006/01/10 03:15:30 rlk Exp $"
+   "$Id: printers.xml,v 1.144 2006/03/12 22:22:12 rlk Exp $"
 -->
 
 <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -12,1448 +12,824 @@
   xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
   <printdef>
     <family name="ps">
-      <printer name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
+      <printer name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0" />
+      <printer name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1" />
     </family>
     <family name="canon">
-      <printer name="Canon BJC 30" driver="bjc-30" manufacturer="Canon" model="30">
-        <parameter type="float" name="Gamma">2.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 50" driver="bjc-50" manufacturer="Canon" model="4400">
+      <parameters name="density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_5_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
         <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 55" driver="bjc-55" manufacturer="Canon" model="4400">
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 80" driver="bjc-80" manufacturer="Canon" model="4400">
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 85" driver="bjc-85" manufacturer="Canon" model="85">
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 210" driver="bjc-210" manufacturer="Canon" model="210">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 240" driver="bjc-240" manufacturer="Canon" model="240">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 250" driver="bjc-250" manufacturer="Canon" model="250">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 1000" driver="bjc-1000" manufacturer="Canon" model="1000">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 2000" driver="bjc-2000" manufacturer="Canon" model="2000">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 3000" driver="bjc-3000" manufacturer="Canon" model="3000">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 4300" driver="bjc-4300" manufacturer="Canon" model="4300">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon BJC 4400 photo" driver="bjc-4400" manufacturer="Canon" model="4400">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 6000" driver="bjc-6000" manufacturer="Canon" model="6000">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon BJC 6100" driver="bjc-6100" manufacturer="Canon" model="6100">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 6200" driver="bjc-6200" manufacturer="Canon" model="6200">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon BJC 6500" driver="bjc-6500" manufacturer="Canon" model="6500">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon BJC 7000" driver="bjc-7000" manufacturer="Canon" model="7000">
-        <parameter type="float" name="Gamma">0.600</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 7100" driver="bjc-7100" manufacturer="Canon" model="7100">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon BJC 8200" driver="bjc-8200" manufacturer="Canon" model="8200">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="4202">
-        <parameter type="float" name="Gamma">0.800</parameter>
-        <parameter type="float" name="Density">0.900</parameter>
-      </printer>
-      <printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">0.800</parameter>
-      </printer>
-      <printer name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500">
-        <parameter type="float" name="Gamma">0.750</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="4000">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
+      </parameters>
+      <parameters name="gamma_6_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">0.6</parameter>
+      </parameters>
+      <parameters name="gamma_8_density_900_params">
+        <parameter type="float" name="Density">0.9</parameter>
+        <parameter type="float" name="Gamma">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_2_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">2.0</parameter>
+      </parameters>
+      <parameters name="gamma_750_params">
+        <parameter type="float" name="Gamma">0.75</parameter>
+      </parameters>
+      <printer name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
+      <printer name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
+      <printer name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
+      <printer name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
+      <printer name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
+      <printer name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
+      <printer name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <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-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" />
+      <printer name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
+      <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 S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="4202" parameters="gamma_8_density_900_params" />
+      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="4202" parameters="gamma_8_density_900_params" />
+      <printer name="Canon 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 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 iP4000" driver="bjc-iP4000" manufacturer="Canon" model="4000" />
     </family>
     <family name="escp2">
-      <printer name="EPSON Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color" driver="escp2" manufacturer="Epson" model="0">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color Pro" driver="escp2-pro" manufacturer="Epson" model="45">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 83" driver="escp2-83" manufacturer="Epson" model="33">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-    <!--
-         Note that the 785EPX has a roll feed holder.  It's more like the 890
-         than the 780, despite the name.
-    -->
-      <printer name="EPSON Stylus Photo 785EPX" driver="escp2-785" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="60">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="60">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="69">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="69">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="60">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="60">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72">
+      <parameters name="standard_params">
         <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="66">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON CL-700" driver="escp2-cl700" manufacturer="Epson" model="38">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON CL-750" driver="escp2-cl750" manufacturer="Epson" model="43">
+      </parameters>
+      <parameters name="480_params">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
         <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON CL-760" driver="escp2-cl760" manufacturer="Epson" model="56">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON E-100" driver="escp2-e100" manufacturer="Epson" model="73">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON EM-900C" driver="escp2-em900c" manufacturer="Epson" model="13">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON EM-930C" driver="escp2-em930c" manufacturer="Epson" model="34">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MC-2000" driver="escp2-mc2000" manufacturer="Epson" model="26">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MC-5000" driver="escp2-mc5000" manufacturer="Epson" model="40">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MC-7000" driver="escp2-mc7000" manufacturer="Epson" model="29">
+      </parameters>
+      <parameters name="pro_5500_params">
         <parameter type="float" name="CyanGamma">0.8</parameter>
         <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MC-9000" driver="escp2-mc9000" manufacturer="Epson" model="31">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MC-10000" driver="escp2-mc10000" manufacturer="Epson" model="41">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MJ-930C" driver="escp2-mj930c" manufacturer="Epson" model="4">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MJ-5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MJ-6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON MJ-8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-700C" driver="escp2-pm700c" manufacturer="Epson" model="9">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-730C" driver="escp2-pm730c" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-740C" driver="escp2-pm740c" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-750C" driver="escp2-pm750c" manufacturer="Epson" model="7">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-760C" driver="escp2-pm760c" manufacturer="Epson" model="20">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-770C" driver="escp2-pm770c" manufacturer="Epson" model="14">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-780C" driver="escp2-pm780c" manufacturer="Epson" model="35">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-800C" driver="escp2-pm800c" manufacturer="Epson" model="22">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-870C" driver="escp2-pm870c" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-880C" driver="escp2-pm880c" manufacturer="Epson" model="36">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-930C" driver="escp2-pm930c" manufacturer="Epson" model="58">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-940C" driver="escp2-pm940c" manufacturer="Epson" model="58">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-950C" driver="escp2-pm950c" manufacturer="Epson" model="53">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-970C" driver="escp2-pm970c" manufacturer="Epson" model="57">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-980C" driver="escp2-pm980c" manufacturer="Epson" model="57">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-10000" driver="escp2-pm10000" manufacturer="Epson" model="41">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-A900" driver="escp2-pma900" manufacturer="Epson" model="70">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-D750" driver="escp2-pmd750" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-D770" driver="escp2-pmd770" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-D1000" driver="escp2-pmd1000" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-G700" driver="escp2-pmg700" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-G720" driver="escp2-pmg720" manufacturer="Epson" model="63">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-G800" driver="escp2-pmg800" manufacturer="Epson" model="68">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PM-G820" driver="escp2-pmg820" manufacturer="Epson" model="68">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-A650" driver="escp2-pxa650" manufacturer="Epson" model="65">
+      </parameters>
+      <parameters name="cx3500_params">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
         <parameter type="float" name="YellowGamma">1.02</parameter>
         <parameter type="float" name="Gamma">0.500</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-G900" driver="escp2-pxg900" manufacturer="Epson" model="64">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-G920" driver="escp2-pxg920" manufacturer="Epson" model="64">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-V500" driver="escp2-pxv500" manufacturer="Epson" model="61">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-V600" driver="escp2-pxv600" manufacturer="Epson" model="69">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-5500" driver="escp2-px5500" manufacturer="Epson" model="71">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-7000" driver="escp2-px7000" manufacturer="Epson" model="48">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
-      <printer name="EPSON PX-9000" driver="escp2-px9000" manufacturer="Epson" model="49">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="Density">1.0</parameter>
-      </printer>
+      </parameters>
+      <printer name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
+      <printer name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer name="Epson Stylus Color IIs" driver="escp2-iis" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
+      <printer name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
+      <printer name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
+      <printer name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
+      <printer name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
+      <printer name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
+      <printer name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
+      <printer name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
+      <printer name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
+      <printer name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
+      <printer name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
+      <printer name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
+      <printer name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
+    <!--
+         Note that the 785EPX has a roll feed holder.  It's more like the 890
+         than the 780, despite the name.
+    -->
+      <printer name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
+      <printer name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer name="Epson Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" />
+      <printer name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
+      <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 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 CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="60" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="60" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="69" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="69" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="60" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="60" parameters="cx3500_params" />
+      <printer name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer name="Epson Stylus DX3850" driver="escp2-dx3850" 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" />
+      <printer name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer name="Epson E 100" driver="escp2-e100" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson E 150" driver="escp2-e150" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson E 200" driver="escp2-e200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
+      <printer name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
+      <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 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" />
+      <printer name="Epson PM 750C" driver="escp2-pm750c" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer name="Epson PM 760C" driver="escp2-pm760c" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer name="Epson PM 770C" driver="escp2-pm770c" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer name="Epson PM 780C" driver="escp2-pm780c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer name="Epson PM 790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson PM 800C" driver="escp2-pm800c" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer name="Epson PM 850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer name="Epson PM 870C" driver="escp2-pm870c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson PM 880C" driver="escp2-pm880c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer name="Epson PM 930C" driver="escp2-pm930c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer name="Epson PM 940C" driver="escp2-pm940c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer name="Epson PM 950C" driver="escp2-pm950c" manufacturer="Epson" model="53" parameters="standard_params" />
+      <printer name="Epson PM 970C" driver="escp2-pm970c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer name="Epson PM 980C" driver="escp2-pm980c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer name="Epson PM 2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer name="Epson PM 2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer name="Epson PM 3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer name="Epson PM 3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer name="Epson PM 3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer name="Epson PM 3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer name="Epson PM 4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer name="Epson PM 5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27" parameters="standard_params" />
+      <printer name="Epson PM 7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28" parameters="standard_params" />
+      <printer name="Epson PM 9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
+      <printer name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
+      <printer name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
+      <printer name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
+      <printer name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
+      <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 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" />
     </family>
     <family name="pcl">
-      <printer name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601">	<!-- Uses 600 series driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690">	<!-- Uses 690 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800">	<!-- Uses 850 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 340" driver="pcl-340" manufacturer="HP" model="340">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-	</printer>
-      <printer name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700">
-	<parameter type="float" name="Gamma">0.818</parameter>
-	<parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750">
+      <parameters name="pcl_inkjet_params">
         <parameter type="float" name="Gamma">0.818</parameter>
         <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 2500C" driver="pcl-desnj-2500" manufacturer="HP" model="12500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 3500C" driver="pcl-desnj-3500" manufacturer="HP" model="13500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230">
-	<parameter type="float" name="Gamma">0.818</parameter>
-	<parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250">
-	<parameter type="float" name="Gamma">0.818</parameter>
-	<parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 600/600C" driver="pcl-600" manufacturer="HP" model="600">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 600 series" driver="pcl-601" manufacturer="HP" model="601">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 690 series" driver="pcl-690" manufacturer="HP" model="690">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840">  <!-- Uses 840 driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 900 series" driver="pcl-900" manufacturer="HP" model="900">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901">  <!-- Uses 900 series driver (large) -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 2000 series" driver="pcl-2000" manufacturer="HP" model="2000">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP DeskJet 2500 series" driver="pcl-2500" manufacturer="HP" model="2500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900">  <!-- Uses 900 series driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900">  <!-- Uses 900 series driver -->
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
-      <printer name="HP LaserJet II series" driver="pcl-2" manufacturer="HP" model="2">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet IIP series" driver="pcl-2p" manufacturer="HP" model="21">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet III series" driver="pcl-3" manufacturer="HP" model="3">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 4 series" driver="pcl-4" manufacturer="HP" model="6">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 5 series" driver="pcl-5" manufacturer="HP" model="6">
+      </parameters>
+      <parameters name="pcl_laser_params">
         <parameter type="float" name="Gamma">1.000</parameter>
         <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="HP LaserJet 6 series" driver="pcl-6" manufacturer="HP" model="6">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </printer>
-      <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </printer>
+      </parameters>
+      <printer name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2600" driver="pcl-apollo-p2600" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apollo P-2650" driver="pcl-apollo-p2650" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601" parameters="pcl_inkjet_params" />	<!-- Uses 600 series driver -->
+      <printer name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690" parameters="pcl_inkjet_params" />	<!-- Uses 690 driver -->
+      <printer name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800" parameters="pcl_inkjet_params" />	<!-- Uses 850 driver -->
+      <printer name="Apple LaserWriter Select 360" driver="pcl-apple-lw360" manufacturer="Apple" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer name="Brother MFC-6550MC" driver="brother-mfc-6550mc" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother MFC-8300" driver="brother-mfc-8300" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer name="Brother MFC-9500" driver="brother-mfc-9500" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Brother MFC-9600" driver="brother-mfc-9600" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
+      <printer name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
+      <printer name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer name="Citizen ProJet II" driver="citizen-projet_ii" manufacturer="Citizen" model="2" parameters="pcl_laser_params" />
+      <printer name="DEC 1800" driver="dec-1800" manufacturer="DEC" model="3" parameters="pcl_laser_params" />
+      <printer name="DEC LN17" driver="dec-ln17" manufacturer="DEC" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer name="Fujitsu PrintPartner 10V" driver="fujitsu-pp_10v" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer name="Fujitsu PrintPartner 16DV" driver="fujitsu-pp_16dv" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer name="Fujitsu PrintPartner 20W" driver="fujitsu-pp_20w" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer name="Fujitsu PrintPartner 8000" driver="fujitsu-pp_8000" manufacturer="Fujitsu" model="3" parameters="pcl_laser_params" />
+      <printer name="Generic PCL 4 Printer" driver="pcl-g_4" manufacturer="Generic" model="2" parameters="pcl_laser_params" />
+      <printer name="Generic PCL 5 Printer" driver="pcl-g_5" manufacturer="Generic" model="3" parameters="pcl_laser_params" />
+      <printer name="Generic PCL 5c Printer" driver="pcl-g_5c" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer name="Generic PCL 5e Printer" driver="pcl-g_5e" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
+      <printer name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <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 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" />
+      <printer name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 750C Plus" driver="hp-desnj_750c_plus" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
+      <printer name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 510" driver="hp-dj_510" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
+      <printer name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2P Plus" driver="hp-lj_2p_plus" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2P" driver="pcl-2p" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3" driver="pcl-3" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <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 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" />
+      <printer name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
+      <printer name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="2" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+      <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
+      <printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
+      <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="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" 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="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" />
+      <printer name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
+      <printer name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
+      <printer name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-4600" driver="samsung-ml-4600" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-5000a" driver="samsung-ml-5000a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-6000" driver="samsung-ml-6000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-6100" driver="samsung-ml-6100" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-7000" driver="samsung-ml-7000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-7000N" driver="samsung-ml-7000n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-7000P" driver="samsung-ml-7000p" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung ML-7050" driver="samsung-ml-7050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <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="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" />
+      <printer name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
+      <printer name="Xerox Able 1406" driver="xerox-able_1406" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint 4508" driver="xerox-dp_4508" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
     </family>
     <family name="lexmark">
-      <printer name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">1.0</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">2.0</parameter>
-      </printer>
-      <printer name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">1.0</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">2.0</parameter>
-      </printer>
-      <printer name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">1.0</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">2.0</parameter>
-      </printer>
-      <printer name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052">
+      <parameters name="standard_params">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">1.0</parameter>
         <parameter type="float" name="Gamma">0.5</parameter>
         <parameter type="float" name="Density">2.0</parameter>
-      </printer>
+      </parameters>
+      <printer name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+      <printer name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
     </family>
     <family name="olympus">
-      <printer name="Olympus P10" driver="olympus-p10" manufacturer="Olympus" model="2">
-      </printer>
-      <printer name="Olympus P200" driver="olympus-p200" manufacturer="Olympus" model="4">
-      </printer>
-      <printer name="Olympus P300" driver="olympus-p300" manufacturer="Olympus" model="0">
-      </printer>
-      <printer name="Olympus P400" driver="olympus-p400" manufacturer="Olympus" model="1">
-      </printer>
-      <printer name="Olympus P440" driver="olympus-p440" manufacturer="Olympus" model="3">
-      </printer>
-      <printer name="Canon CP100" driver="canon-cp100" manufacturer="Canon" model="1000">
-      </printer>
-      <printer name="Canon CP220" driver="canon-cp220" manufacturer="Canon" model="1001">
-      </printer>
-      <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000">
-      </printer>
-      <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001">
-      </printer>
-      <printer name="Fujifilm Printpix CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000">
-      </printer>
-      <printer name="Fujifilm Printpix CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001">
-      </printer>
+      <printer name="Olympus P-10" driver="olympus-p10" manufacturer="Olympus" model="2" />
+      <printer name="Olympus P-11" driver="olympus-p11" manufacturer="Olympus" model="2" />
+      <printer name="Olympus P-200" driver="olympus-p200" manufacturer="Olympus" model="4" />
+      <printer name="Olympus P-300" driver="olympus-p300" manufacturer="Olympus" model="0" />
+      <printer name="Olympus P-300E" driver="olympus-p300e" manufacturer="Olympus" model="0" />
+      <printer name="Olympus P-300U" driver="olympus-p300u" manufacturer="Olympus" model="0" />
+      <printer name="Olympus P-330E" driver="olympus-p330e" manufacturer="Olympus" model="0" />
+      <printer name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
+      <printer name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
+      <printer name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
+      <printer name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
+      <printer name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
+      <printer name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
+      <printer name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" />
+      <printer name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
+      <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
+      <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
+      <printer name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
+      <printer name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
     </family>
     <family name="raw">
-      <printer name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0">
-      </printer>
-      <printer name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1">
-      </printer>
+      <printer name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
+      <printer name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1" />
     </family>
   </printdef>
 </gutenprint>
diff --git a/src/testpattern/Makefile.am b/src/testpattern/Makefile.am
index 45027ff..6db8e05 100644
--- a/src/testpattern/Makefile.am
+++ b/src/testpattern/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.23 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.24 2006/05/12 01:10:19 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -26,14 +26,14 @@ include $(top_srcdir)/scripts/global.mk
 
 pkgdatadir = $(datadir)/$(PACKAGE)/samples
 
-TESTS = run-testpattern run-testpattern-1
+TESTS = run-testpattern run-testpattern-1 run-testpattern-2
 
 
 ## Programs
 
 if BUILD_TESTPATTERN
 bin_PROGRAMS = testpattern
-noinst_PROGRAMS = printers
+noinst_PROGRAMS = printers printer_options
 endif
 
 AM_LFLAGS = -i
@@ -46,6 +46,7 @@ testpatternl.o: testpatterny.o
 testpattern.o: testpatterny.o
 
 printers_LDADD = $(GUTENPRINT_LIBS)
+printer_options_LDADD = $(GUTENPRINT_LIBS)
 
 
 ## Data
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index 0a5dbd8..698168d 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -39,10 +42,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/scripts/global.mk testpatternl.c testpatterny.c \
-	testpatterny.h
+	$(srcdir)/run-testpattern-2.in $(top_srcdir)/scripts/global.mk \
+	testpatternl.c testpatterny.c testpatterny.h
 @BUILD_TESTPATTERN_TRUE@bin_PROGRAMS = testpattern$(EXEEXT)
-@BUILD_TESTPATTERN_TRUE@noinst_PROGRAMS = printers$(EXEEXT)
+@BUILD_TESTPATTERN_TRUE@noinst_PROGRAMS = printers$(EXEEXT) \
+@BUILD_TESTPATTERN_TRUE@	printer_options$(EXEEXT)
 subdir = src/testpattern
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -56,13 +60,16 @@ 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 =
+CONFIG_CLEAN_FILES = run-testpattern-2
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"
 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)
 printers_SOURCES = printers.c
 printers_OBJECTS = printers.$(OBJEXT)
-am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
 printers_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
 	testpatternl.$(OBJEXT)
@@ -84,8 +91,8 @@ LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
 	$(AM_YFLAGS)
-SOURCES = printers.c $(testpattern_SOURCES)
-DIST_SOURCES = printers.c $(testpattern_SOURCES)
+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'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -281,6 +288,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -340,12 +348,13 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-TESTS = run-testpattern run-testpattern-1
+TESTS = run-testpattern run-testpattern-1 run-testpattern-2
 AM_LFLAGS = -i
 AM_YFLAGS = -d
 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
 MAINTAINERCLEANFILES = Makefile.in testpatternl.c testpatterny.c testpatterny.h
 EXTRA_DIST = testpatterny.h $(pkgdata_DATA) run-testpattern run-testpattern-1
@@ -382,6 +391,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+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)"
@@ -417,6 +428,9 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	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)
 printers$(EXEEXT): $(printers_OBJECTS) $(printers_DEPENDENCIES) 
 	@rm -f printers$(EXEEXT)
 	$(LINK) $(printers_LDFLAGS) $(printers_OBJECTS) $(printers_LDADD) $(LIBS)
@@ -749,9 +763,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
new file mode 100644
index 0000000..9381be0
--- /dev/null
+++ b/src/testpattern/printer_options.c
@@ -0,0 +1,246 @@
+/*
+ * "$Id: printer_options.c,v 1.1 2006/05/12 01:10:19 rlk Exp $"
+ *
+ *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *
+ *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <string.h>
+#include <gutenprint/gutenprint.h>
+#include <gutenprint/gutenprint-intl.h>
+
+int
+main(int argc, char **argv)
+{
+  int i, j, k;
+  stp_parameter_level_t max_level = STP_PARAMETER_LEVEL_ADVANCED4;
+  if (argc > 1 && !strcmp(argv[1], "-s"))
+    max_level = STP_PARAMETER_LEVEL_BASIC;
+
+  stp_init();
+  for (i = 0; i < stp_printer_model_count(); i++)
+    {
+      stp_parameter_list_t params;
+      int nparams;
+      stp_parameter_t desc;
+      const stp_printer_t *printer = stp_get_printer_by_index(i);
+      const char *driver = stp_printer_get_driver(printer);
+      const char *family = stp_printer_get_family(printer);
+      stp_vars_t *pv = stp_vars_create_copy(stp_printer_get_defaults(printer));
+      int tcount = 0;
+      size_t count;
+      int printer_is_color = 0;
+      if (strcmp(family, "ps") == 0 || strcmp(family, "raw") == 0)
+	continue;
+
+      /* Set Job Mode to "Job" as this enables the Duplex option */
+      stp_set_string_parameter(pv, "JobMode", "Job");
+
+      stp_describe_parameter(pv, "PrintingMode", &desc);
+      if (stp_string_list_is_present(desc.bounds.str, "Color"))
+	printer_is_color = 1;
+      stp_parameter_description_destroy(&desc);
+      if (printer_is_color)
+	stp_set_string_parameter(pv, "PrintingMode", "Color");
+      else
+	stp_set_string_parameter(pv, "PrintingMode", "BW");
+      stp_set_string_parameter(pv, "ChannelBitDepth", "8");
+
+      printf("# Printer model %s, long name `%s'\n", driver,
+	     stp_printer_get_long_name(printer));
+
+      printf("$families{'%s'} = '%s';\n", driver, family);
+      printf("$models{'%s'} = '%d';\n", driver, stp_get_model_id(pv));
+
+      params = stp_get_parameter_list(pv);
+      nparams = stp_parameter_list_count(params);
+
+      for (k = 0; k < nparams; k++)
+	{
+	  const stp_parameter_t *p = stp_parameter_list_param(params, k);
+	  if (p->read_only ||
+	      (p->p_level > max_level && strcmp(p->name, "Resolution") != 0) ||
+	      (p->p_class != STP_PARAMETER_CLASS_OUTPUT &&
+	       p->p_class != STP_PARAMETER_CLASS_CORE &&
+	       p->p_class != STP_PARAMETER_CLASS_FEATURE))
+	    continue;
+	  count = 0;
+	  stp_describe_parameter(pv, p->name, &desc);
+	  if (desc.is_active)
+	    {
+	      printf("$longnames{'%s'} = '%s';\n",
+		     desc.name, desc.text);
+	      printf("$param_classes{'%s'} = %d;\n",
+		     desc.name, desc.p_class);
+	      printf("$param_levels{'%s'} = %d;\n",
+		     desc.name, desc.p_level);
+	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+		{
+		  count = stp_string_list_count(desc.bounds.str);
+		  if (count > 0)
+		    {
+		      if (desc.is_mandatory)
+			{
+			  printf("$defaults{'%s'}{'%s'} = '%s';\n",
+				 driver, desc.name, desc.deflt.str);
+			}
+		      else
+			{
+			  printf("$defaults{'%s'}{'%s'} = '%s';\n",
+				 driver, desc.name, "None");
+			  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+				 driver, desc.name, "None", "None");
+			}
+		      for (j = 0; j < count; j++)
+			{
+			  const stp_param_string_t *param =
+			    stp_string_list_param(desc.bounds.str, j);
+			  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+				 driver, desc.name, param->name, param->text);
+			  if (strcmp(desc.name, "Resolution") == 0)
+			    {
+			      int x, y;
+			      stp_set_string_parameter(pv, "Resolution",
+						       param->name);
+			      stp_describe_resolution(pv, &x, &y);
+			      if (x > 0 && y > 0)
+				{
+				  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%d';\n",
+					 driver, "x_resolution", param->name, x);
+				  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%d';\n",
+					 driver, "y_resolution", param->name, y);
+				}
+			    }
+			}
+		    }
+		}
+	      else if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
+		{
+		  if (desc.is_mandatory)
+		    {
+		      printf("$defaults{'%s'}{'%s'} = '%d';\n",
+			     driver, desc.name, desc.deflt.boolean);
+		    }
+		  else
+		    {
+		      printf("$defaults{'%s'}{'%s'} = '%s';\n",
+			     driver, desc.name, "None");
+		      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+			     driver, desc.name, "None", "None");
+		    }
+		    
+		  printf("$stpdata{'%s'}{'%s'}{'False'} = 'False';\n",
+			 driver, desc.name);
+		  printf("$stpdata{'%s'}{'%s'}{'True'} = 'True';\n",
+			 driver, desc.name);
+		}
+	      else if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE)
+		{
+		  if (desc.bounds.dbl.lower <= desc.deflt.dbl &&
+		      desc.bounds.dbl.upper >= desc.deflt.dbl)
+		    {
+		      printf("$stp_float_values{'%s'}{'MINVAL'}{'%s'} = %.3f;\n",
+			     driver, desc.name, desc.bounds.dbl.lower);
+		      printf("$stp_float_values{'%s'}{'MAXVAL'}{'%s'} = %.3f;\n",
+			     driver, desc.name, desc.bounds.dbl.upper);
+		      printf("$stp_float_values{'%s'}{'DEFVAL'}{'%s'} = %.3f;\n",
+			     driver, desc.name, desc.deflt.dbl);
+		      /* printf("$stp_float_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
+			 driver, desc.name, _(desc.text)); */
+		      printf("$stp_float_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
+			     driver, desc.name, _(desc.category));
+		      printf("$stp_float_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
+			     driver, desc.name, (desc.help ? _(desc.help) : "''"));
+		      printf("$stp_float_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
+			     driver, desc.name, desc.is_mandatory);
+		    }
+		}
+	      else if (desc.p_type == STP_PARAMETER_TYPE_INT)
+		{
+		  if (desc.bounds.integer.lower <= desc.deflt.integer &&
+		      desc.bounds.integer.upper >= desc.deflt.integer)
+		    {
+		      printf("$stp_int_values{'%s'}{'MINVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.bounds.integer.lower);
+		      printf("$stp_int_values{'%s'}{'MAXVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.bounds.integer.upper);
+		      printf("$stp_int_values{'%s'}{'DEFVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.deflt.integer);
+		      /* printf("$stp_int_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
+			 driver, desc.name, _(desc.text)); */
+		      printf("$stp_int_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
+			     driver, desc.name, _(desc.category));
+		      printf("$stp_int_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
+			     driver, desc.name, (desc.help ? _(desc.help) : "''"));
+		      printf("$stp_int_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
+			     driver, desc.name, desc.is_mandatory);
+		    }
+		}
+	      else if (desc.p_type == STP_PARAMETER_TYPE_DIMENSION)
+		{
+		  if (desc.bounds.dimension.lower <= desc.deflt.dimension &&
+		      desc.bounds.dimension.upper >= desc.deflt.dimension)
+		    {
+		      printf("$stp_dimension_values{'%s'}{'MINVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.bounds.dimension.lower);
+		      printf("$stp_dimension_values{'%s'}{'MAXVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.bounds.dimension.upper);
+		      printf("$stp_dimension_values{'%s'}{'DEFVAL'}{'%s'} = %d;\n",
+			     driver, desc.name, desc.deflt.dimension);
+		      /* printf("$stp_dimension_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
+			 driver, desc.name, _(desc.text)); */
+		      printf("$stp_dimension_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
+			     driver, desc.name, _(desc.category));
+		      printf("$stp_dimension_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
+			     driver, desc.name, (desc.help ? _(desc.help) : "''"));
+		      printf("$stp_dimension_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
+			     driver, desc.name, desc.is_mandatory);
+		    }
+		}
+	      tcount += count;
+	    }
+	  stp_parameter_description_destroy(&desc);
+	}
+      stp_parameter_list_destroy(params);
+      if (tcount > 0)
+	{
+	  if (printer_is_color)
+	    {
+	      printf("$defaults{'%s'}{'%s'} = '%s';\n",
+		     driver, "Color", "Color");
+	      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+		     driver, "Color", "Color", "Color");
+	      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+		     driver, "Color", "RawCMYK", "Raw CMYK");
+	    }
+	  else
+	    printf("$defaults{'%s'}{'%s'} = '%s';\n",
+		   driver, "Color", "Grayscale");
+	  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+		 driver, "Color", "Grayscale", "Gray Scale");
+	  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+		 driver, "Color", "BlackAndWhite", "Black and White");
+	}
+      stp_vars_destroy(pv);
+    }
+  return 0;
+}
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
new file mode 100644
index 0000000..daba8db
--- /dev/null
+++ b/src/testpattern/run-testpattern-2.in
@@ -0,0 +1,236 @@
+#!@PERL@
+
+use Getopt::Long;
+Getopt::Long::Configure("bundling", "no_ignore_case", "pass_through");
+
+use strict;
+
+my $valgrind = 0;
+my $cachegrind = 0;
+my $gdb_attach = 0;
+my $dontrun = 0;
+my $retval = 0;
+my @printer_list = ();
+
+my @extras = ();
+my @messages = ();
+my %stpdata = ();
+my %models_found = ();
+my %models;
+my %families;
+my $skip_duplicate_printers = 0;
+
+GetOptions("v+"  => \$valgrind,
+	   "c"   => \$cachegrind,
+	   "g"   => \$gdb_attach,
+	   "n"   => \$dontrun,
+	   "s!"  => \$skip_duplicate_printers);
+
+my $pwd = `pwd`;
+chomp $pwd;
+
+if (! defined $ENV{"STP_DATA_PATH"}) {
+    $ENV{"STP_DATA_PATH"} = "${pwd}/../main";
+}
+
+if (! defined $ENV{"STP_MODULE_PATH"}) {
+    $ENV{"STP_MODULE_PATH"} = "${pwd}/../main:${pwd}/../main/.libs";
+}
+
+sub set_opt($$) {
+    my ($opt, $val) = @_;
+    push @extras, "parameter \"$opt\" \"$val\";\n";
+}
+
+sub set_message($) {
+    my ($message) = @_;
+    push @messages, "message \"$message\";\n";
+}
+
+sub print_one_testpattern($) {
+    my ($printer) = @_;
+    my $stuff = "printer \"$printer\";\n";
+    $stuff .= join "", @extras, @messages;
+    $stuff .= << 'EOF';
+hsize 0.1;
+vsize 0.1;
+left 0.15;
+top 0.15;
+blackline 0;
+steps 16;
+mode rgb 8;
+pattern 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0 ;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 0.0 1.0 0.0 1.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 1.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 1.0 1.0 0.0 1.0 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 -2.0 1.0 0.0 -2.0 1.0 0.0 -2.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.1 0.3 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.3 0.7 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.1 0.999 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.3 0.999 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.5 0.999 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.1 0.3 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.3 0.7 1.0 1.0 1.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.1 0.999 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.3 0.999 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 0.5 0.999 -2.0 -2.0 -2.0 0.0 1.0 1.0  0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.0 1.0 0.0 0.75 1.0 0.0 0.75 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.0 1.0 0.0 0.75 1.0 0.0 0.75 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.0 1.0 0.0 0.5 1.0 0.0 0.5 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.0 1.0 0.0 0.5 1.0 0.0 0.5 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.0 1.0 0.0 0.25 1.0 0.0 0.25 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.0 1.0 0.0 0.25 1.0 0.0 0.25 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.0 1.0 0.0 0.1 1.0 0.0 0.1 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.0 1.0 0.0 0.1 1.0 0.0 0.1 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 0.0 1.0 0.0 1.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.75 1.0 0.0 0.0 1.0 0.0 0.75 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.75 1.0 0.0 0.0 1.0 0.0 0.75 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.5 1.0 0.0 0.0 1.0 0.0 0.5 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.5 1.0 0.0 0.0 1.0 0.0 0.5 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.25 1.0 0.0 0.0 1.0 0.0 0.25 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.25 1.0 0.0 0.0 1.0 0.0 0.25 1.0;
+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.0 1.0 0.0 0.1 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.0 1.0 0.0 0.1 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 1.0 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.75 1.0 0.0 0.75 1.0 0.0 0.0 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.25 1.0  0.0 0.75 1.0 0.0 0.75 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.5 1.0 0.0 0.5 1.0 0.0 0.0 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.5 1.0  0.0 0.5 1.0 0.0 0.5 1.0 0.0 0.0 1.0;
+pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.25 1.0 0.0 0.25 1.0 0.0 0.0 1.0;
+pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.75 1.0  0.0 0.25 1.0 0.0 0.25 1.0 0.0 0.0 1.0;
+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;
+}
+
+open PIPE, "./printer_options|" or die "Cannot run printer_options: $!\n";
+while(<PIPE>) {
+    next if m!^#!;
+    eval $_;
+}
+close PIPE or die "Cannot run printer_options: $!\n";
+
+if ($#ARGV >= 0) {
+    @printer_list = @ARGV;
+} else {
+    open PIPE, "./printers|" or die "Cannot run printers: $!\n";
+    while(<PIPE>) {
+	next if m!^#!;
+	chomp;
+	push @printer_list, $_;
+    }
+    close PIPE;
+}
+
+sub do_printer($$) {
+    my ($printer, $fh) = @_;
+    my $tmp = $stpdata{$printer}{'Resolution'};
+    my $min_res_name;
+    my $min_res_value = 0;
+    my $first_time = 1;
+    my $model_id = $models{$printer};
+    my $family_id = $families{$printer};
+    if ($skip_duplicate_printers && $models_found{$family_id}{$model_id}) {
+	return;
+    } else {
+	$models_found{$family_id}{$model_id} = 1;
+    }
+    my (@resolutions) = grep {$_ ne 'None' } keys %$tmp;
+    $tmp = $stpdata{$printer}{'PrintingMode'};
+    my (@printing_modes) = grep {$_ ne 'None' } keys %$tmp;
+    $tmp = $stpdata{$printer}{'InkType'};
+    my (@ink_types) = grep {$_ ne 'None' } keys %$tmp;
+    foreach $tmp (sort @resolutions) {
+	my $res_value = ($stpdata{$printer}{'x_resolution'}{$tmp} *
+			 $stpdata{$printer}{'y_resolution'}{$tmp});
+	if ($min_res_value == 0 || $res_value < $min_res_value) {
+	    $min_res_value = $res_value;
+	    $min_res_name = $tmp;
+	}
+    }
+    # We want to do all resolutions and all ink types in both color modes.
+    # We don't need to do both resolutions and ink types.
+    my $pmode;
+    foreach $pmode (@printing_modes) {
+	my ($resolution, $ink_type);
+	foreach $resolution (@resolutions) {
+	    @extras = ();
+	    @messages = ();
+	    if ($first_time) {
+		set_message("$printer\n");
+		$first_time = 0;
+	    }
+	    set_opt("PrintingMode", $pmode);
+	    set_opt("Resolution", $resolution);
+	    set_opt("DitherAlgorithm", "Fast");
+	    set_opt("ColorCorrection", "Raw");
+	    set_message("    ${pmode}+${resolution}");
+	    my $output = print_one_testpattern($printer);
+	    print $fh $output;
+	}
+	if ($#ink_types >= 1) {
+	    foreach $ink_type (@ink_types) {
+		@extras = ();
+		@messages = ();
+		if ($first_time) {
+		    set_message("$printer\n");
+		    $first_time = 0;
+		}
+		set_opt("PrintingMode", $pmode);
+		set_opt("Resolution", $min_res_name);
+		set_opt("InkType", $ink_type);
+		set_opt("DitherAlgorithm", "Fast");
+		set_opt("ColorCorrection", "Raw");
+		set_message("    ${ink_type}+${pmode}+${min_res_name}");
+		my $output = print_one_testpattern($printer);
+		print $fh $output;
+	    }
+	}
+    }
+}
+
+if ($dontrun) {
+    map { do_printer($_, \*STDOUT) } @printer_list;
+    exit 0;
+} else {
+    my $testpattern_command;
+    my $valgrind_command;
+    my $valopts;
+    if ($cachegrind) {
+	$valopts = '--tool=cachegrind';
+	$valgrind = 4;
+    } elsif ($valgrind) {
+	$valopts = '--tool=memcheck';
+    }
+    if ($gdb_attach) {
+	$valopts .= ' --db-attach=yes';
+    }
+    if ($valgrind == 1) {
+	$valgrind_command = "valgrind $valopts -q --num-callers=100 --error-limit=no --leak-check=yes";
+    } elsif ($valgrind == 2) {
+	$valgrind_command = "valgrind $valopts --num-callers=100 --error-limit=no --show-reachable=yes --leak-resolution=high --leak-check=yes";
+    } elsif ($valgrind == 3) {
+	$valgrind_command = "valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes";
+    } elsif ($valgrind == 4) {
+	$valgrind_command = "valgrind $valopts";
+    }
+
+    $testpattern_command = "$valgrind_command ./testpattern -n";
+	
+    open TESTPATTERN, "|$testpattern_command" or
+	die "Can't run $testpattern_command: $!\n";
+    map { do_printer($_, \*TESTPATTERN) } @printer_list;
+    my $status = close TESTPATTERN;
+    if ($status) {
+	exit 0;
+    } else {
+	exit 1;
+    }
+}
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index 1585303..db7fe2f 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.43 2006/01/15 22:00:57 rlk Exp $"
+ * "$Id: testpattern.c,v 1.44 2006/04/18 12:30:57 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -39,6 +39,7 @@
 #include <math.h>
 #include <string.h>
 #include "testpattern.h"
+#include <gutenprint/gutenprint-intl.h>
 
 extern int yyparse(void);
 
@@ -239,7 +240,9 @@ do_print(void)
   stp_set_outdata(global_vars, stdout);
   stp_set_errdata(global_vars, stderr);
 
+  setlocale(LC_ALL, "C");
   retval = yyparse();
+  setlocale(LC_ALL, "");
   if (retval)
     return retval + 1;
 
diff --git a/test/Makefile.am b/test/Makefile.am
index a4a1d48..150e2c6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.44 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.46 2006/05/12 01:10:19 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS)
 
 TESTS = curve run-testdither run-weavetest
 
-
 ## Programs
 
 if BUILD_TEST
diff --git a/test/Makefile.in b/test/Makefile.in
index 31a2f89..ddbb656 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#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@
@@ -284,6 +287,7 @@ 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@
 ac_ct_AR = @ac_ct_AR@
@@ -695,9 +699,6 @@ uninstall-am: uninstall-info-am
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/test/escp2-weavetest.c b/test/escp2-weavetest.c
index 48ebea8..f63b956 100644
--- a/test/escp2-weavetest.c
+++ b/test/escp2-weavetest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-weavetest.c,v 1.36 2005/05/27 02:11:51 rlk Exp $"
+ * "$Id: escp2-weavetest.c,v 1.37 2006/05/05 23:23:40 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -379,6 +379,9 @@ run_weavetest_from_stdin(void)
   int total_cases = 0;
   int failures = 0;
   char linebuf[4096];
+  const char *spinner = "/-\\|";
+  int rotor = 0;
+  int do_spinner = isatty(fileno(stdout));
   while (fgets(linebuf, 4096, stdin))
     {
       int retval;
@@ -409,6 +412,12 @@ run_weavetest_from_stdin(void)
 	    }
 	  if (previous_separation != physsep)
 	    printf(".");
+	  if (do_spinner)
+	    {
+	      putchar((int) (spinner[rotor++]));
+	      putchar((int) '\b');
+	      rotor &= 3;
+	    }
 	  previous_strategy = strategy;
 	  previous_jets = physjets;
 	  previous_separation = physsep;
diff --git a/test/parse-escp2 b/test/parse-escp2
index 39ecf46..0a0d45c 100755
--- a/test/parse-escp2
+++ b/test/parse-escp2
@@ -1,12 +1,18 @@
 #!/usr/bin/perl
 
-require("getopts.pl");
+use Getopt::Std;
+use strict;
 
-do Getopts('v');
+getopts('v');
 
-while (<>) {
-    $stuff .= $_;
-}
+use vars qw($atend
+	    $stuff
+	    $opt_v
+	    $curpos
+	    $esc
+	    %seqtable);
+
+$atend = 0;
 
 %seqtable = ( "@", 0,
 	      "(R", "REMOTE",
@@ -23,24 +29,61 @@ while (<>) {
 
 $esc = "\033";
 
-$skipcount = 0;
 $curpos = 0;
-$verbose = $opt_v;
 
-sub do_remote_command {
+sub get_stuff($) {
+    my ($where) = @_;
+    my ($end) = length $stuff;
+    if ($curpos == 0 && $end == 0) {
+	$stuff = <>;		# Need to do this once to "activate" ARGV
+	$end = length $stuff;
+    }
+    my ($old_end) = length $stuff;
+    my ($tmp);
+    my ($bytes_to_read) = 4096;
+    if ($where - $end > $bytes_to_read) {
+	$bytes_to_read = $where - $end;
+    }
+    while ($end < $where) {
+	my $foo = read ARGV, $tmp, $bytes_to_read;
+#	print STDERR length $tmp, " ", length $stuff, " $curpos $where $bytes_to_read $foo $!", "\n";
+	$stuff .= $tmp;
+#	print STDERR length $tmp, " ", length $stuff, " $curpos $where $bytes_to_read $foo $!", "\n\n";
+	$end = length $stuff;
+	if ($old_end == $end) {
+	    $atend = 1;
+	    return 0;
+	} else {
+	    $bytes_to_read -= $end - $old_end;
+	    $old_end = $end;
+	}
+    }
+    return 1;
+}
+
+sub increment_curpos($) {
+    my ($curpos_increment) = @_;
+    substr($stuff, 0, $curpos_increment) = "";
+    $curpos += $curpos_increment;
+}
+
+sub do_remote_command() {
     print "\n";
     printf "%08x  ", $curpos;
     print "1b  (  R ";
-    substr($stuff, 0, 3) = "";
-    $curpos += 3;
-    $lchar = substr($stuff, 0, 1);
-    $nlchar = unpack("C", $lchar);
-    $hchar = substr($stuff, 1, 1);
-    $nhchar = unpack("C", $hchar);
+    increment_curpos(3);
+    get_stuff(2);
+    my $lchar = substr($stuff, 0, 1);
+    my $nlchar = unpack("C", $lchar);
+    my $hchar = substr($stuff, 1, 1);
+    my $nhchar = unpack("C", $hchar);
     printf "%02x %02x ", $nlchar, $nhchar;
-    $skipchars = ($nhchar * 256) + $nlchar;
-    substr($stuff, 0, 2) = "";
-    $curpos += 2;
+    my $skipchars = ($nhchar * 256) + $nlchar;
+    increment_curpos(2);
+    my $i;
+    my $char;
+    my $nchar;
+    get_stuff($skipchars);
     for ($i = 0; $i < $skipchars; $i++) {
 	$char = substr($stuff, $i, 1);
 	$nchar = unpack("C", $char);
@@ -50,15 +93,15 @@ sub do_remote_command {
 	    printf "%02x ", $nchar;
 	}
     }
-    substr($stuff, 0, $skipchars) = "";
-    $curpos += $skipchars;
-    while (substr($stuff, 0, 2) =~ /[A-Z0-9][A-Z0-9]/) {
+    increment_curpos($skipchars);
+    while (get_stuff(2) &&
+	   substr($stuff, 0, 2) =~ /[A-Z0-9][A-Z0-9]/) {
 	print "\n";
 	printf "%08x    ", $curpos;
 	my ($cmd) = substr($stuff, 0, 2);
-	print substr($stuff, 0, 2);
-	substr($stuff, 0, 2) = "";
-	$curpos += 2;
+	print $cmd;
+	increment_curpos(2);
+	get_stuff(2);
 	$lchar = substr($stuff, 0, 1);
 	$nlchar = unpack("C", $lchar);
 	$hchar = substr($stuff, 1, 1);
@@ -69,21 +112,25 @@ sub do_remote_command {
 	    $skipchars = ($nhchar * 256) + $nlchar;
 	}
 	printf "%02x %02x ", $nlchar, $nhchar;
-	substr($stuff, 0, 2) = "";
-	$curpos += 2;
+	increment_curpos(2);
+	get_stuff($skipchars);
 	for ($i = 0; $i < $skipchars; $i++) {
 	    printf "%02x ", unpack("C", substr($stuff, $i, 1));
 	}
-	substr($stuff, 0, $skipchars) = "";
-	$curpos += $skipchars;
+	increment_curpos($skipchars);
     }
 }
 
-sub do_special_command {
+sub print_prefix_bytes($) {
+    my ($bytes_to_print) = @_;
     print "\n";
     printf "%08x  ", $curpos;
     print "1b ";
-    for ($i = 1; $i < 8; $i++) {
+    my $i;
+    my $char;
+    my $nchar;
+    get_stuff($bytes_to_print);
+    for ($i = 1; $i < $bytes_to_print; $i++) {
 	$char = substr($stuff, $i, 1);
 	$nchar = unpack("C", $char);
 	if ($i < 2 && $nchar >= 32 && $nchar < 127) {
@@ -92,130 +139,48 @@ sub do_special_command {
 	    printf "%02x ", unpack("C", $char);
 	}
     }
-    $comptype = unpack("C", substr($stuff, 2, 1));
-    $dots = unpack("v", substr($stuff, 6, 2));
-    $something = unpack("C", substr($stuff, 5, 1));
-    print " ($dots, $something) ";
-    $savedots = $dots;
-    $dots *= $something;
-    $curpos += 8;
-    substr($stuff, 0, 8) = "";
-    if ($comptype == 0) {
-	$bytes = ($dots + 7) / 8;
-	if ($verbose) {
-	    for ($k = 0; $k < $bytes; $k++) {
-		$char = substr($stuff, $k, 1);
-		printf "%02x", unpack("C", $char);
-	    }
-	}
-	$curpos += $bytes;
-	substr($stuff, 0, $bytes) = "";
-    } elsif ($comptype == 1) {
-	while ($something > 0) {
-	    $dots = $savedots;
-	    while ($dots > 0) {
-		$counter = unpack("C", substr($stuff, 0, 1));
-		$curpos++;
-		substr($stuff, 0, 1) = "";
-		if ($counter <= 127) {
-		    $counter++;
-		    if ($verbose) {
-			for ($k = 0; $k < $counter; $k++) {
-			    $char = substr($stuff, $k, 1);
-			    printf "%02x ", unpack("C", $char);
-			}
-		    }
-		    $curpos += $counter;
-		    substr($stuff, 0, $counter) = "";
-		    $dots -= 8 * $counter;
-		} else {
-		    $counter = 257 - $counter;
-		    if ($verbose) {
-			for ($k = 0; $k < $counter; $k++) {
-			    $char = substr($stuff, 0, 1);
-			    printf "%02x ", unpack("C", $char);
-			}
-		    }
-		    $curpos++;
-		    substr($stuff, 0, 1) = "";
-		    $dots -= 8 * $counter;
-		}
-	    }
-	    $something--;
-	}
-    } else {
-	print "\nUnknown compression type $comptype!\n";
-    }
 }
 
-sub do_special1_command {
-    print "\n";
-    printf "%08x  ", $curpos;
-    print "1b ";
-    for ($i = 1; $i < 9; $i++) {
-	$char = substr($stuff, $i, 1);
-	$nchar = unpack("C", $char);
-	if ($i < 2 && $nchar >= 32 && $nchar < 127) {
-	    print " $char ";
-	} else {
-	    printf "%02x ", unpack("C", $char);
-	}
-    }
-    $comptype = unpack("C", substr($stuff, 3, 1));
-    $bitsperpixel = unpack("C", substr($stuff, 4, 1));
-    $dots = unpack("v", substr($stuff, 5, 2));
-    $something = unpack("v", substr($stuff, 7, 2));
-    print " ($dots, $something, $bitsperpixel) ";
+sub print_output_data($$$$$) {
+    my ($comptype, $bitsperpixel, $dots, $rows, $dot_scale) = @_;
+    my $counter;
+    my $fchar;
+    print " ($dots, $rows, $bitsperpixel) ";
     $dots *= 8;
-    $savedots = $dots;
-    $dots *= $something;
-    $curpos += 9;
-    substr($stuff, 0, 9) = "";
+    $dots /= $dot_scale;
+    my $savedots = $dots;
     if ($comptype == 0) {
-	$bytes = ($dots + 7) / 8;
-	if ($verbose) {
-	    for ($k = 0; $k < $bytes; $k++) {
-		$char = substr($stuff, $k, 1);
-		printf "%02x", unpack("C", $char);
-	    }
+	if ($opt_v) {
+	    get_stuff($dots);
+	    printf "%*v02x ", " ", substr($stuff, 0, $dots);
 	}
-	$curpos += $bytes;
-	substr($stuff, 0, $bytes) = "";
+	increment_curpos($dots);
     } elsif ($comptype == 1) {
-	while ($something > 0) {
+	while ($rows-- > 0) {
 	    $dots = $savedots;
 	    while ($dots > 0) {
-		$counter = unpack("C", substr($stuff, 0, 1));
-		$curpos++;
-		substr($stuff, 0, 1) = "";
+		get_stuff(1);
+		$counter = ord(substr($stuff, 0, 1));
+		increment_curpos(1);
 		if ($counter <= 127) {
 		    $counter++;
-#		    printf(" (%d) ", $counter);
-		    if ($verbose) {
-			for ($k = 0; $k < $counter; $k++) {
-			    $char = substr($stuff, $k, 1);
-			    printf "%02x ", unpack("C", $char);
-			}
+		    get_stuff($counter);
+		    if ($opt_v) {
+			printf "%*v02x ", " ", substr($stuff, 0, $counter);
 		    }
-		    $curpos += $counter;
-		    substr($stuff, 0, $counter) = "";
-		    $dots -= 8 * $counter;
+		    increment_curpos($counter);
 		} else {
 		    $counter = 257 - $counter;
-#		    printf(" (%d %d) ", $counter, unpack("C", substr($stuff, 0, 1)));
-		    if ($verbose) {
-			$char = substr($stuff, 0, 1);
-			for ($k = 0; $k < $counter; $k++) {
-			    printf "%02x ", unpack("C", $char);
-			}
+		    get_stuff(1);
+		    if ($opt_v) {
+			$fchar = sprintf "%v02x ", substr($stuff, 0, 1);
+			map { print $fchar } (0..$counter - 1);
 		    }
-		    $curpos++;
-		    substr($stuff, 0, 1) = "";
-		    $dots -= 8 * $counter;
+		    increment_curpos(1);
 		}
+		$dots -= $counter * 8;
 	    }
-	    $something--;
-	    if ($something > 0 && $verbose) {
+	    if ($rows > 0 && $opt_v) {
 		print "\n        ";
 	    }
 	}
@@ -224,10 +189,47 @@ sub do_special1_command {
     }
 }
 
-while ($stuff ne "") {
+sub do_special_command() {
+    get_stuff(8);
+    my $comptype = unpack("C", substr($stuff, 2, 1));
+    my $dots = unpack("v", substr($stuff, 6, 2));
+    my $rows = unpack("C", substr($stuff, 5, 1));
+    print_prefix_bytes(8);
+    increment_curpos(8);
+    print_output_data($comptype, 1, $dots, $rows, 8);
+}
+
+sub do_special1_command() {
+    get_stuff(9);
+    my $comptype = unpack("C", substr($stuff, 3, 1));
+    my $bitsperpixel = unpack("C", substr($stuff, 4, 1));
+    my $dots = unpack("v", substr($stuff, 5, 2));
+    my $rows = unpack("v", substr($stuff, 7, 2));
+    print_prefix_bytes(9);
+    increment_curpos(9);
+    print_output_data($comptype, $bitsperpixel, $dots, $rows, 1);
+}
+
+while (! $atend) {
+    my $found;
+    my $key;
+    my $skipchars;
+    my $startoff;
+    my $kchar;
+    my $nkchar;
+    my $lchar;
+    my $nlchar;
+    my $hchar;
+    my $nhchar;
+    my $i;
+    my $char;
+    my $nchar;
+    my $bytes;
+    get_stuff(2);
     if (substr($stuff, 0, 1) eq "$esc") {
 	$found = 0;
 	foreach $key (sort { length $b <=> length $a } keys %seqtable) {
+	    get_stuff(1 + length $key);
 	    if (substr($stuff, 1, length $key) eq $key) {
 		$skipchars = $seqtable{$key};
 		if ($skipchars eq "SPECIAL") {
@@ -245,6 +247,7 @@ while ($stuff ne "") {
 		    print "1b ";
 		    $startoff = 0;
 		    if ($skipchars eq "VARIABLE") {
+			get_stuff((length $key) + 3);
 			$kchar = substr($stuff, (length $key) + 1, 1);
 			$nkchar = unpack("C", $kchar);
 			$lchar = substr($stuff, (length $key) + 2, 1);
@@ -254,6 +257,7 @@ while ($stuff ne "") {
 			$skipchars = ($nhchar * 256) + $nlchar;
 			$startoff = 3;
 		    }
+		    get_stuff($skipchars + (length $key) + $startoff + 1);
 		    for ($i = 0;
 			 $i < $skipchars + (length $key) + $startoff;
 			 $i++) {
@@ -275,14 +279,13 @@ while ($stuff ne "") {
 	    print "\n";
 	    printf "%08x  ", $curpos;
 	    print "1b ";
-	    substr($stuff, 0, 1) = "";
-	    $curpos += 1;
+	    increment_curpos(1);
 	} elsif ($found == 1) {
-	    substr($stuff, 0, $bytes) = "";
-	    $curpos += $bytes;
+	    increment_curpos($bytes);
 	} else {
 	}
     } else {
+	get_stuff(1);
 	$char = substr($stuff, 0, 1);
 	$nchar = unpack("C", $char);
 	if ($nchar >= 32 && $nchar < 127) {
@@ -290,7 +293,6 @@ while ($stuff ne "") {
 	} else {
 	    printf "*%02x ", unpack("C", $char);
 	}
-	$curpos++;
-	substr($stuff, 0, 1) = "";
+	increment_curpos(1);
     }
 }
diff --git a/test/run-testdither b/test/run-testdither
index b217788..9f592c2 100755
--- a/test/run-testdither
+++ b/test/run-testdither
@@ -2,30 +2,6 @@
 
 out_status=0
 
-if [ $# -eq 0 ] ; then
-   quiet=quiet
-fi
-
-if [ -z "$bits" ] ; then
-    bits='1-bit 2-bit'
-fi
-
-if [ -z "$dither_types" ] ; then
-    dither_types='gray color photo cmyk photocmyk'
-fi
-
-if [ -z "$image_types" ] ; then
-    image_types='mixed white black colorimage random'
-fi
-
-if [ -z "$algos" ] ; then
-    algos='Adaptive Ordered Fast VeryFast Floyd EvenTone'
-fi
-
-if [ -z "$print_image" ] ; then
-    image='no-image'
-fi
-
 if [ -z "$STP_DATA_PATH" ] ; then
     STP_DATA_PATH=`pwd`/../src/main
     export STP_DATA_PATH
@@ -36,21 +12,37 @@ if [ -z "$STP_MODULE_PATH" ] ; then
     export STP_MODULE_PATH
 fi
 
-for algo in $algos ; do
-    echo -n "Testing $algo:"
-    for bit in $bits ; do
-        for dither_type in $dither_types  ; do
-	    for image_type in $image_types ; do
-		./testdither $quiet $image $bit $dither_type $image_type $algo
-		status=$?
-		if [ "$status" -ne 0 ] ; then
-		    echo ./testdither $image $bit $dither_type $image_type $algo failed
-		    out_status=`expr $out_status + 1`
-		fi
-	    done
-	done
+valcount=0
+valgrind=
+valopts=''
+
+set_args() {
+    while true ; do
+	case "$1" in
+	    -h*|--h*) usage ;;
+	    -v|--valgrind) valopts='--tool=memcheck' ; valcount=`expr $valgrind + 1` ;;
+	    -c|--cachegrind) valopts='--tool=cachegrind'; valcount=4 ;;
+	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
+	    -V|--verbose) quiet= ;;
+	    -q|--quiet) quiet=quiet ;;
+	    --) shift; args="$@"; return ;;
+	    *) return ;;
+	esac
+    shift
     done
-    echo
-done
+}
+
+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" ;;
+    3) valopts="$valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes" ;;
+    *) ;;
+esac
+
+if [ -n "$valopts" ] ; then
+    valgrind="valgrind $valopts"
+fi
 
-exit $out_status
+$valgrind ./testdither
diff --git a/test/run-weavetest b/test/run-weavetest
index cde055f..f87315e 100755
--- a/test/run-weavetest
+++ b/test/run-weavetest
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-echo "$0 may take a very long time to complete.  Please wait..."
+if [ -z "$STP_DATA_PATH" ] ; then
+    STP_DATA_PATH=`pwd`/../src/main
+    export STP_DATA_PATH
+fi
+
+if [ -z "$STP_MODULE_PATH" ] ; then
+    STP_MODULE_PATH=`pwd`/../src/main:`pwd`/../src/main/.libs
+    export STP_MODULE_PATH
+fi
 
 passes='1,1,1 2,1,1 1,2,1 1,2,2 1,4,1 4,1,1 4,2,1 2,2,1 1,4,2 2,2,2 2,4,2 8,1,1 4,4,2 8,2,1 16,1,1'
 
@@ -8,7 +16,7 @@ passes='1,1,1 2,1,1 1,2,1 1,2,2 1,4,1 4,1,1 4,2,1 2,2,1 1,4,2 2,2,2 2,4,2 8,1,1
 jets='1 2 4 8 15 16 20 21 24 29 32 47 48 59 60 64 90 96 128 144 180 192 208 360'
 
 # All nozzle separations used by any printer at any resolution.
-separations='1 2 3 4 6 8 12 16'
+separations='1 2 3 4 6 8 12 16 24'
 
 # Weave strategies
 strategies='0 1 2 3 4'
diff --git a/test/testdither.c b/test/testdither.c
index de1da06..4a2d1f3 100644
--- a/test/testdither.c
+++ b/test/testdither.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testdither.c,v 1.48 2005/05/07 14:46:41 rlk Exp $"
+ * "$Id: testdither.c,v 1.49 2006/05/07 13:26:27 rlk Exp $"
  *
  *   Test/profiling program for dithering code.
  *
@@ -61,11 +61,30 @@ int		image_type = IMAGE_MIXED;
 int		stpi_dither_type = DITHER_COLOR;
 const char     *dither_name = NULL;
 int		dither_bits = 1;
+int		write_image = 1;
+int		quiet;
 unsigned short	white_line[IMAGE_WIDTH * 6],
 		black_line[IMAGE_WIDTH * 6],
 		color_line[IMAGE_WIDTH * 6],
 		random_line[IMAGE_WIDTH * 6];
 
+static const char	*stpi_dither_types[] =	/* Different dithering modes */
+	      {
+		"gray",
+		"color",
+		"photo",
+		"cmyk",
+		"photocmyk"
+	      };
+static const char	*image_types[] =	/* Different image types */
+	      {
+		"mixed",
+		"white",
+		"black",
+		"colorimage",
+		"random"
+	      };
+
 
 #define SHADE(density, name)					\
 {  density, sizeof(name)/sizeof(stp_dotsize_t), name  }
@@ -150,12 +169,11 @@ static stp_image_t theImage =
  * 'main()' - Test dithering code for performance measurement.
  */
 
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+static int
+run_one_testdither(void)
 {
   int print_progress = 0;
-  int		i, j;			/* Looping vars */
+  int		i;			/* Looping vars */
   unsigned char	black[BUFFER_SIZE],	/* Black bitmap data */
 		cyan[BUFFER_SIZE],	/* Cyan bitmap data */
 		magenta[BUFFER_SIZE],	/* Magenta bitmap data */
@@ -164,29 +182,11 @@ main(int  argc,				/* I - Number of command-line arguments */
 		yellow[BUFFER_SIZE];	/* Yellow bitmap data */
   unsigned short rgb[IMAGE_WIDTH * 6],	/* RGB buffer */
 		gray[IMAGE_WIDTH];	/* Grayscale buffer */
-  int		write_image;		/* Write the image to disk? */
   FILE		*fp = NULL;		/* PPM/PGM output file */
   char		filename[1024];		/* Name of file */
   stp_vars_t	*v; 		        /* Dither variables */
   stp_parameter_t desc;
-  static const char	*stpi_dither_types[] =	/* Different dithering modes */
-		{
-		  "gray",
-		  "color",
-		  "photo",
-		  "cmyk",
-		  "photocmyk"
-		};
-  static const char	*image_types[] =	/* Different image types */
-		{
-		  "mixed",
-		  "white",
-		  "black",
-		  "colorimage",
-		  "random"
-		};
   struct timeval tv1, tv2;
-  int quiet = 0;
 
  /*
   * Initialise libgutenprint
@@ -198,66 +198,6 @@ main(int  argc,				/* I - Number of command-line arguments */
   stp_describe_parameter(v, "DitherAlgorithm", &desc);
 
  /*
-  * Get command-line args...
-  */
-
-  write_image = 1;
-
-  for (i = 1; i < argc; i ++)
-  {
-    if (strcmp(argv[i], "no-image") == 0)
-    {
-      write_image = 0;
-      continue;
-    }
-
-    if (strcmp(argv[i], "quiet") == 0)
-    {
-      quiet = 1;
-      continue;
-    }
-
-    if (strcmp(argv[i], "1-bit") == 0)
-    {
-      dither_bits = 1;
-      continue;
-    }
-
-    if (strcmp(argv[i], "2-bit") == 0)
-    {
-      dither_bits = 2;
-      continue;
-    }
-
-    for (j = 0; j < 5; j ++)
-      if (strcmp(argv[i], stpi_dither_types[j]) == 0)
-        break;
-
-    if (j < 5)
-    {
-      stpi_dither_type = j;
-      continue;
-    }
-
-    for (j = 0; j < 5; j ++)
-      if (strcmp(argv[i], image_types[j]) == 0)
-        break;
-
-    if (j < 5)
-    {
-      image_type = j;
-      continue;
-    }
-
-    for (j = 0; j < stp_string_list_count(desc.bounds.str); j ++)
-      if (strcmp(argv[i], stp_string_list_param(desc.bounds.str,j)->name) == 0)
-	dither_name = stp_string_list_param(desc.bounds.str, j)->name;
-
-    if (!dither_name)
-      printf("Unknown option \"%s\" ignored!\n", argv[i]);
-  }
-
- /*
   * Setup the image and color functions...
   */
 
@@ -426,6 +366,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 	  dither_name ? dither_name : desc.deflt.str, dither_bits,
 	  (stpi_dither_type == DITHER_GRAY) ? "pgm" : "ppm");
 
+  stp_parameter_description_destroy(&desc);
+
   if (isatty(1))
     print_progress = 1;
 
@@ -489,9 +431,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   if (fp != NULL)
     fclose(fp);
 
-  if (quiet)
-    fputc('.', stdout);
-  else
+  if (!quiet)
     {
       if (print_progress)
 	fputc('\r', stdout);
@@ -503,6 +443,126 @@ main(int  argc,				/* I - Number of command-line arguments */
   return 0;
 }
 
+static int
+run_testdither_from_cmdline(int argc, char **argv)
+{
+  int i, j;
+  int status;
+  for (i = 1; i < argc; i ++)
+    {
+      if (strcmp(argv[i], "no-image") == 0)
+	{
+	  write_image = 0;
+	  continue;
+	}
+
+      if (strcmp(argv[i], "quiet") == 0)
+	{
+	  quiet = 1;
+	  continue;
+	}
+
+      if (strcmp(argv[i], "1-bit") == 0)
+	{
+	  dither_bits = 1;
+	  continue;
+	}
+
+      if (strcmp(argv[i], "2-bit") == 0)
+	{
+	  dither_bits = 2;
+	  continue;
+	}
+
+      for (j = 0; j < 5; j ++)
+	if (strcmp(argv[i], stpi_dither_types[j]) == 0)
+	  break;
+
+      if (j < 5)
+	{
+	  stpi_dither_type = j;
+	  continue;
+	}
+
+      for (j = 0; j < 5; j ++)
+	if (strcmp(argv[i], image_types[j]) == 0)
+	  break;
+
+      if (j < 5)
+	{
+	  image_type = j;
+	  continue;
+	}
+
+      dither_name = argv[i];
+    }
+  status = run_one_testdither();
+  if (status)
+    return 1;
+  else
+    return 0;
+}
+
+static int
+run_standard_testdithers(void)
+{
+  stp_vars_t *v = stp_vars_create();
+  stp_parameter_t desc;
+  int j;
+  int failures = 0;
+  int status;
+
+  stp_set_driver(v, "escp2-ex");
+  stp_describe_parameter(v, "DitherAlgorithm", &desc);
+
+  write_image = 0;
+  quiet = 1;
+  for (j = 0; j < stp_string_list_count(desc.bounds.str); j ++)
+    {
+      dither_name = stp_string_list_param(desc.bounds.str, j)->name;
+      if (strcmp(dither_name, "None") == 0)
+	continue;
+      printf("%s", dither_name);
+      fflush(stdout);
+      for (dither_bits = 1; dither_bits <= 2; dither_bits++)
+	for (stpi_dither_type = 0;
+	     stpi_dither_type < sizeof(stpi_dither_types) / sizeof(const char *);
+	     stpi_dither_type++)
+	  for (image_type = 0;
+	       image_type < sizeof(image_types) / sizeof(const char *);
+	       image_type++)
+	    {
+	      status = run_one_testdither();
+	      if (status)
+		{
+		  printf("%s %d %s %s\n", dither_name, dither_bits,
+			 stpi_dither_types[stpi_dither_type],
+			 image_types[image_type]);
+		  failures++;
+		}
+	      else
+		printf(".");
+	      fflush(stdout);
+	    }
+      printf("\n");
+      fflush(stdout);
+    }
+  stp_parameter_description_destroy(&desc);
+  stp_vars_destroy(v);
+  return (failures ? 1 : 0);
+}
+
+int
+main(int argc, char **argv)
+{
+  stp_init();
+
+  if (argc == 1)
+    return run_standard_testdithers();
+  else
+    return run_testdither_from_cmdline(argc, argv);
+}
+
 
 void
 image_get_row(unsigned short *data,
@@ -949,5 +1009,5 @@ write_photo(FILE          *fp,
 
 
 /*
- * End of "$Id: testdither.c,v 1.48 2005/05/07 14:46:41 rlk Exp $".
+ * End of "$Id: testdither.c,v 1.49 2006/05/07 13:26:27 rlk Exp $".
  */
diff --git a/test/unprint.c b/test/unprint.c
index aed2c65..bdc0003 100644
--- a/test/unprint.c
+++ b/test/unprint.c
@@ -1,4 +1,4 @@
-/* $Id: unprint.c,v 1.36 2005/10/23 19:43:14 rlk Exp $ */
+/* $Id: unprint.c,v 1.37 2006/04/13 12:09:15 rlk Exp $ */
 /*
  * Generate PPM files from printer output
  *
@@ -432,8 +432,8 @@ write_output(FILE *fp_w, int dontwrite, int allblack)
   right = pstate.right_edge;
   height = oversample * (last - first + 1);
 
-  fprintf(stderr, "Image from (%d,%d) to (%d,%d).\n",
-	  left, first, right, last);
+  fprintf(stderr, "Image from (%d,%d) to (%d,%d) (%dx%d).\n",
+	  left, first, right, last, right - left, last - first);
 
   width = right - left + 1;
   if (width < 0)